From 8c33255c0a450180bc791caf07623097c6d72bac Mon Sep 17 00:00:00 2001
From: Sam Tygier <sam.tygier@stfc.ac.uk>
Date: Fri, 2 Jun 2023 11:52:06 +0100
Subject: [PATCH 1/3] Skip mantidimaging in create_dev_env even when it has as
 version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0a2e791da78..2d9d631736b 100644
--- 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:

From b79400c9ea1b859cfe10158ea6560700ba43d1d1 Mon Sep 17 00:00:00 2001
From: Sam Tygier <sam.tygier@stfc.ac.uk>
Date: Fri, 2 Jun 2023 12:03:52 +0100
Subject: [PATCH 2/3] Changes to setup.py should also invalidate the mamba
 cache

---
 .github/workflows/conda.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 0917c688bce..07735e53b61 100644
--- 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/setup-miniconda@v2.2.0

From 8aad8b1596189c77c9dba630c98d8adfc9b7cf3d Mon Sep 17 00:00:00 2001
From: Sam Tygier <sam.tygier@stfc.ac.uk>
Date: Fri, 18 Aug 2023 15:44:56 +0100
Subject: [PATCH 3/3] Pin tifffile=2023.7.18 imagecodecs=2023.1.23

---
 conda/meta.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda/meta.yaml b/conda/meta.yaml
index 7ebcdc50c8a..6970d118d17 100644
--- 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.*