Remove temporary changes from pytest runs

lanl · Nov 6, 2024 · fa007c3 · fa007c3
1 parent bd581c1
commit fa007c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml
@@ -57,11 +57,10 @@ jobs:
           pip install pytest-split
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
-          # Temporarily disabled due to svmbir failure with numpy 2.x under Python 3.12
-          # conda install -c conda-forge svmbir>=0.3.3
+          conda install -c conda-forge svmbir>=0.4.0
           conda install -c astra-toolbox astra-toolbox
           conda install -c conda-forge pyyaml
-          pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
+          # pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
           pip install bm3d>=4.0.0
           pip install bm4d>=4.0.0
           pip install "ray[tune]>=2.5.0"

diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml
@@ -60,11 +60,10 @@ jobs:
           pip install pytest-split
           pip install -r requirements.txt
           pip install -r dev_requirements.txt
-          # svmbir install temporarily disabled due to import errors
-          #conda install -c conda-forge svmbir>=0.3.3
+          conda install -c conda-forge svmbir>=0.4.0
           conda install -c conda-forge astra-toolbox
           conda install -c conda-forge pyyaml
-          pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
+          # pip install --upgrade --force-reinstall scipy>=1.6.0  # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version
           pip install bm3d>=4.0.0
           pip install bm4d>=4.2.2
           pip install "ray[tune]>=2.5.0"