Merge branch 'main' into brendt/issue442

lanl · Oct 23, 2023 · 836dd10 · 836dd10
2 parents 7da14bf + b8c8bab
commit 836dd10
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml
@@ -66,6 +66,7 @@ jobs:
           mamba 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 bm4d>=4.0.0
+          pip install bm4d>=4.2.2
           pip install "ray[tune]>=2.0.0"
           pip install hyperopt
       # Install package to be tested

diff --git a/data b/data
diff --git a/examples/examples_requirements.txt b/examples/examples_requirements.txt
@@ -3,3 +3,5 @@ colour_demosaicing
 xdesign>=0.5.5
 ray[tune]>=2.0.0
 hyperopt
+bm3d>=4.0.0
+bm4d>=4.2.2
diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,5 @@ matplotlib
 jaxlib>=0.4.3,<=0.4.16
 jax>=0.4.3,<=0.4.16
 flax>=0.6.1,<=0.6.9
-bm3d>=4.0.0
-bm4d>=4.2.2
 svmbir>=0.3.3
 pyabel>=0.9.0