From d8c5e37620399d3029474c8db42ea62abf19dc0f Mon Sep 17 00:00:00 2001
From: Daniel Hollas <daniel.hollas@bristol.ac.uk>
Date: Wed, 22 May 2024 03:07:19 +0100
Subject: [PATCH 1/3] GHA: Fix test-install workflow

---
 .github/workflows/test-install.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index c72c1f4ba6..a3bf124cd1 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -216,10 +216,10 @@ jobs:
       run: sudo apt update && sudo apt install postgresql graphviz
 
     - name: Install aiida-core
-      uses: .github/actions/install-aiida-core
+      uses: ./.github/actions/install-aiida-core
       with:
         python-version: ${{ matrix.python-version }}
-        extras: '[atomic_tools, docs, notebook, rest, tests, tui]'
+        extras: '[atomic_tools,docs,notebook,rest,tests,tui]'
         from-requirements: 'false'
 
     - name: Setup AiiDA environment

From 7cb4d0dade58148f92b3cfc8904671e788ee4678 Mon Sep 17 00:00:00 2001
From: Daniel Hollas <daniel.hollas@bristol.ac.uk>
Date: Wed, 22 May 2024 05:47:09 +0100
Subject: [PATCH 2/3] Fix sphinxext test

---
 tests/sphinxext/test_workchain.py                       | 1 +
 tests/sphinxext/test_workchain/test_workchain_build.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/sphinxext/test_workchain.py b/tests/sphinxext/test_workchain.py
index cf114e3896..a88d9dc300 100644
--- a/tests/sphinxext/test_workchain.py
+++ b/tests/sphinxext/test_workchain.py
@@ -24,6 +24,7 @@ def test_workchain_build(sphinx_build_factory, file_regression):
     # Need to remove the ``source`` attribute of the ``document`` tag as that is variable.
     output = (sphinx_build.outdir / 'index.xml').read_text()
     output = re.sub(r'source=".*"', '', output)
+    output = re.sub(r'<!-- Generated by Docutils.*-->', '<!-- Generated by Docutils -->', output)
 
     file_regression.check(output, encoding='utf-8', extension='.xml')
 
diff --git a/tests/sphinxext/test_workchain/test_workchain_build.xml b/tests/sphinxext/test_workchain/test_workchain_build.xml
index 20ca79ea9c..f7a8c30cac 100644
--- a/tests/sphinxext/test_workchain/test_workchain_build.xml
+++ b/tests/sphinxext/test_workchain/test_workchain_build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">
-<!-- Generated by Docutils 0.20.1 -->
+<!-- Generated by Docutils -->
 <document >
     <section ids="sphinx-aiida-demo" names="sphinx-aiida\ demo">
         <title>sphinx-aiida demo</title>

From 04677ce6444fd003e000896a78c5273a00693900 Mon Sep 17 00:00:00 2001
From: Daniel Hollas <daniel.hollas@bristol.ac.uk>
Date: Wed, 22 May 2024 07:47:37 +0100
Subject: [PATCH 3/3] Fix artifact upload

---
 .github/workflows/test-install.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
index a3bf124cd1..c0d0ab12d9 100644
--- a/.github/workflows/test-install.yml
+++ b/.github/workflows/test-install.yml
@@ -239,7 +239,7 @@ jobs:
     # updating the requirements (in case they are  inconsistent with the pyproject.toml file).
     - uses: actions/upload-artifact@v4
       with:
-        name: requirements.txt
+        name: requirements-py-${{ matrix.python-version }}.txt
         path: requirements-py-${{ matrix.python-version }}.txt
 
 # Check whether the requirements/ files are consistent with the dependency specification in the pyproject.toml file.
@@ -293,7 +293,8 @@ jobs:
       if: steps.check_reqs.outcome == 'Failure'  # only run if requirements/ are inconsistent
       uses: actions/download-artifact@v4
       with:
-        name: requirements.txt
+        pattern: requirements-py-*
+        merge-multiple: true
         path: requirements
 
     - name: Commit requirements files