Package version fixes for 2.5.1 (#1905)

mantidproject · Aug 21, 2023 · 9f870c6 · 9f870c6
2 parents 0c20e83 + 8aad8b1
commit 9f870c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -47,7 +47,7 @@ jobs:
         with:
           path: /usr/share/miniconda3/envs/mantidimaging-dev.cache
           key:
-            ${{runner.os}}-condaenv-${{env.CACHE_NUMBER}}-${{steps.get-date.outputs.date}}-${{hashFiles('environment-dev.yml','conda/meta.yaml')}}
+            ${{runner.os}}-condaenv-${{env.CACHE_NUMBER}}-${{steps.get-date.outputs.date}}-${{hashFiles('environment-dev.yml','conda/meta.yaml', 'setup.py')}}
 
       - name: Setup Mambaforge
         uses: conda-incubator/[email protected]

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -20,8 +20,8 @@ requirements:
     - astropy=5.0.*
     - scipy=1.7.*
     - scikit-image=0.19.*
-    - tifffile=2023.8.12
-    - imagecodecs=2023.8.12
+    - tifffile=2023.7.18
+    - imagecodecs=2023.1.23
     - numpy=1.20.*
     - numexpr=2.8.*
     - algotom=1.0.*

diff --git a/setup.py b/setup.py
@@ -199,7 +199,7 @@ def make_environment_file(self, extra_deps):
         output_env_file = tempfile.NamedTemporaryFile("wt", delete=False, suffix=".yaml")
         with dev_env_file.open() as dev_env_file_fh:
             for line in dev_env_file_fh:
-                if line.strip() == "- mantidimaging":
+                if line.strip().startswith("- mantidimaging"):
                     for extra_dep in extra_deps:
                         output_env_file.write(f"  - {extra_dep}\n")
                 else: