From b5565af9371c79ae43a9f981a258092762acabd4 Mon Sep 17 00:00:00 2001 From: algol Date: Tue, 31 Mar 2026 11:00:33 +0100 Subject: [PATCH 1/2] adding artifact to docs build --- .github/workflows/httomo_docs.yml | 18 ++++++++++++++---- docs/source/backends/templates.rst | 30 ++++++++++++++---------------- docs/source/pipelines/yaml.rst | 2 -- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/httomo_docs.yml b/.github/workflows/httomo_docs.yml index 72ab3fe84..d0a908cad 100644 --- a/.github/workflows/httomo_docs.yml +++ b/.github/workflows/httomo_docs.yml @@ -17,12 +17,12 @@ jobs: shell: bash -el {0} steps: - name: Checkout repository code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - - name: Setup Python 3.10 - uses: actions/setup-python@v4 + - name: Setup Python 3.12 + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - name: httomo-docs uses: mamba-org/setup-micromamba@v2 @@ -40,6 +40,10 @@ jobs: run: | python ./docs/source/scripts/execute_pipelines_build.py -o ./docs/source/pipelines_full/ + - name: Create ZIP archive for pipelines + run: | + zip -r pipelines_full_artifact.zip ./docs/source/pipelines_full/ + - name: Build docs run: sphinx-build -a -E -b html ./docs/source/ ./docs/build/ @@ -48,3 +52,9 @@ jobs: run: ghp-import -n -p -f ./docs/build env: GITHUB_TOKEN: ${{ github.token }} + + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: full_pipelines-artifact + path: pipelines_full_artifact.zip \ No newline at end of file diff --git a/docs/source/backends/templates.rst b/docs/source/backends/templates.rst index d60d641e4..ebf6cb7bd 100644 --- a/docs/source/backends/templates.rst +++ b/docs/source/backends/templates.rst @@ -9,27 +9,12 @@ Here you can find either fixed (archived) templates that were previously release If you installed HTTomo with a specific version associated with the release, please use the :ref:`archived_templates`. If you are a developer, or you need to access the latest developments, please use the :ref:`latest_templates`. -.. _archived_templates: - -Archived Templates -=================== - -These are archived YAML templates that can be used with already released and tagged version of HTTomo. - -.. only:: builder_html - - :download:`HTTomo version 2.5 templates <../templates_archive/httomo_ver2_5_yaml_templates.zip>` - - :download:`HTTomo version 2.6 templates <../templates_archive/httomo_ver2_6_yaml_templates.zip>` - - :download:`HTTomo version 3.0 templates <../templates_archive/httomo_ver3_0_yaml_templates.zip>` - .. _latest_templates: Latest Templates ================ -The templates below are generated for the current/latest HTTomo development. These templates can be updated frequently and +The templates below are generated for the **current/latest** HTTomo development. These templates can be updated frequently and if you need to use templates that are linked to a specific released (tagged) HTTomo version, please see the archives above. .. note:: At DLS, the templates bellow should work with the :code:`httomo/latest` module. @@ -39,3 +24,16 @@ if you need to use templates that are linked to a specific released (tagged) HTT `HTTomolib Modules `_ `TomoPy Modules `_ + +.. _archived_templates: + +Archived Templates +=================== + +These are archived YAML templates that can be used with already released and tagged version of HTTomo. + +.. only:: builder_html + + :download:`HTTomo version 2.6 templates <../templates_archive/httomo_ver2_6_yaml_templates.zip>` + + :download:`HTTomo version 3.0 templates <../templates_archive/httomo_ver3_0_yaml_templates.zip>` diff --git a/docs/source/pipelines/yaml.rst b/docs/source/pipelines/yaml.rst index 9e1db1c9e..865de1735 100644 --- a/docs/source/pipelines/yaml.rst +++ b/docs/source/pipelines/yaml.rst @@ -19,8 +19,6 @@ These are archived full YAML pipelines that can be used with already released an .. only:: builder_html - :download:`HTTomo version 2.5 full YAML pipelines <../templates_archive/httomo_ver2_5_full_yaml_pipelines.zip>` - :download:`HTTomo version 2.6 full YAML pipelines <../templates_archive/httomo_ver2_6_full_yaml_pipelines.zip>` :download:`HTTomo version 3.0 full YAML pipelines <../templates_archive/httomo_ver3_0_full_yaml_pipelines.zip>` From a84e9d50ecb2fcc569101b77af1d33e2192cc780 Mon Sep 17 00:00:00 2001 From: algol Date: Tue, 31 Mar 2026 11:18:59 +0100 Subject: [PATCH 2/2] removes ccpi reg dependency --- .github/workflows/lint.yml | 2 +- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fed315149..88cbb6e2f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Run black uses: psf/black@stable diff --git a/pyproject.toml b/pyproject.toml index 49abafc2a..b8415c4e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -86,7 +86,6 @@ dev-gpu = [ "mypy", "types-PyYAML", "pre-commit", - "ccpi-regularisation-cupy", ] [tool.mypy]