Merge branch 'main' into stripe_ti_fix

Author: dkazanc

.github/workflows/httomolibgpu_tests_run_iris.yml

@@ -1,8 +1,5 @@
 name: httomolibgpu quick tests
 on:
-  push:
-    branches:
-      - main
   pull_request:
     branches:
       - main

.github/workflows/httomolibgpu_zenodotests_iris.yml

@@ -1,11 +1,11 @@
 name: httomolibgpu zenodo tests
 on:
   pull_request:
-    branches:
-      - main
+    types: [ labeled ]
 
 jobs:
   iris-gpu:
+    if: ${{ github.event.label.name == 'run-zenodo-tests' }}
     runs-on: iris-gpu
     container:
       image: nvidia/cuda:12.6.3-devel-ubi8
@@ -35,9 +35,7 @@ jobs:
           pip install .[dev]
           micromamba list
 
-      # Optional: Run Zenodo tests only if PR has a label
       - name: Download and run Zenodo tests
-        if: contains(github.event.pull_request.labels.*.name, 'run-zenodo-tests')
         run: |
           chmod +x ./.scripts/download_zenodo.py
           ./.scripts/download_zenodo.py zenodo-tests/large_data_archive

.github/workflows/main-checks.yml

@@ -30,11 +30,6 @@ jobs:
           post-cleanup: 'all'
           init-shell: bash
 
-      - name: Download test data from Zenodo
-        run: |
-          chmod +x ./.scripts/download_zenodo.py
-          ./.scripts/download_zenodo.py zenodo-tests/large_data_archive
-
       - name: Install httomolibgpu
         run: |
           pip install .[dev]
@@ -44,6 +39,8 @@ jobs:
         run: |
           pytest tests/
 
-      - name: Run Zenodo tests
+      - name: Download Zenodo data and run large data tests
         run: |
+          chmod +x ./.scripts/download_zenodo.py
+          ./.scripts/download_zenodo.py zenodo-tests/large_data_archive
           pytest zenodo-tests/

README.rst

@@ -34,7 +34,7 @@ Conda environment
 
    $ conda create --name httomolibgpu # create a fresh conda environment
    $ conda activate httomolibgpu # activate the environment
-   $ conda install -c conda-forge cupy==12.3.0 # for linux users
+   $ conda install conda-forge::cupy==12.3.0
    $ pip install httomolibgpu
 
 Setup the development environment: