From 856f6b119fc20c535a44dbcc4791cae5016c46c6 Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 08:30:05 +0000
Subject: [PATCH 01/11] Test deploy without versioningit write

---
 .github/workflows/deploy_conda_nightly.yml | 12 ++++++------
 pyproject.toml                             |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy_conda_nightly.yml b/.github/workflows/deploy_conda_nightly.yml
index 6a240873..44059642 100644
--- a/.github/workflows/deploy_conda_nightly.yml
+++ b/.github/workflows/deploy_conda_nightly.yml
@@ -1,11 +1,11 @@
 name: Deploy MSlice nightly
 
-on:
-  workflow_run:
-    workflows: ["MSlice nightly build"]
-    branches: [main]
-    types:
-      - completed
+on: push
+#  workflow_run:
+#    workflows: ["MSlice nightly build"]
+#    branches: [main]
+#    types:
+#      - completed
 
 jobs:
   build_conda_and_upload:
diff --git a/pyproject.toml b/pyproject.toml
index 118adce8..31d41df7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -103,5 +103,5 @@ distance = "{version}.dev{distance}"
 dirty = "{version}+uncommitted"
 distance-dirty = "{version}.dev{distance}+uncommitted"
 
-[tool.versioningit.write]
-file = "src/mslice/__init__.py"
\ No newline at end of file
+# [tool.versioningit.write]
+# file = "src/mslice/__init__.py"
\ No newline at end of file

From 2a073b6e6cb515314ae01ec23f6e68fe92f07f28 Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 08:34:38 +0000
Subject: [PATCH 02/11] Force deploy even without code changes

---
 .github/workflows/deploy_conda_nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy_conda_nightly.yml b/.github/workflows/deploy_conda_nightly.yml
index 44059642..c35ee1ea 100644
--- a/.github/workflows/deploy_conda_nightly.yml
+++ b/.github/workflows/deploy_conda_nightly.yml
@@ -26,7 +26,7 @@ jobs:
           echo "recentCommits=$(test -z $(git log --since="yesterday" -1 --format=%h) && echo false || echo true)" >> $GITHUB_ENV
 
       - name: Setup Miniconda
-        if: ${{ env.recentCommits == 'true'}}
+#        if: ${{ env.recentCommits == 'true'}}
         uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -35,7 +35,7 @@ jobs:
           auto-activate-base: false
 
       - name: Build MSlice nightly conda package
-        if: ${{ env.recentCommits == 'true'}}
+#        if: ${{ env.recentCommits == 'true'}}
         uses: ./.github/actions/publish-package
         with:
           label: nightly

From 1ff6cd5cd2f78e789986c573a264a73beee8c3ce Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 08:39:44 +0000
Subject: [PATCH 03/11] Don't use uncommitted tag

---
 pyproject.toml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 31d41df7..c7f41e40 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -101,7 +101,8 @@ method = "minor"
 [tool.versioningit.format]
 distance = "{version}.dev{distance}"
 dirty = "{version}+uncommitted"
-distance-dirty = "{version}.dev{distance}+uncommitted"
+distance-dirty = "{version}.dev{distance}"
+# distance-dirty = "{version}.dev{distance}+uncommitted"
 
-# [tool.versioningit.write]
-# file = "src/mslice/__init__.py"
\ No newline at end of file
+[tool.versioningit.write]
+file = "src/mslice/__init__.py"
\ No newline at end of file

From 911baac252c4dde5778d43bd7c0ebce8fc5ab39b Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 09:31:02 +0000
Subject: [PATCH 04/11] Pin wheel and setuptools

---
 pyproject.toml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c7f41e40..62349399 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools >= 65.0.0",
-            "wheel",
+requires = ["setuptools = 75.1.0", # >= 65.0.0",
+            "wheel = 0.44.0",
             "versioningit",]
 build-backend = "setuptools.build_meta"
 
@@ -101,8 +101,7 @@ method = "minor"
 [tool.versioningit.format]
 distance = "{version}.dev{distance}"
 dirty = "{version}+uncommitted"
-distance-dirty = "{version}.dev{distance}"
-# distance-dirty = "{version}.dev{distance}+uncommitted"
+distance-dirty = "{version}.dev{distance}+uncommitted"
 
 [tool.versioningit.write]
 file = "src/mslice/__init__.py"
\ No newline at end of file

From 0f1b0b3b5acb7f824aa0b10626df1258b276ebad Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 09:38:03 +0000
Subject: [PATCH 05/11] Pin wheel and setuptools in github action

---
 .github/actions/publish-package/action.yml | 2 ++
 pyproject.toml                             | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml
index f6cfbc39..76c8ddd7 100644
--- a/.github/actions/publish-package/action.yml
+++ b/.github/actions/publish-package/action.yml
@@ -25,6 +25,8 @@ runs:
       conda create -n build-env
       conda activate build-env
       mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
+      mamba install wheel=0.44.0
+      mamba install setuptools=75.1.0
       conda config --add channels mantid/label/nightly
       conda config --add channels mantid
 
diff --git a/pyproject.toml b/pyproject.toml
index 62349399..118adce8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools = 75.1.0", # >= 65.0.0",
-            "wheel = 0.44.0",
+requires = ["setuptools >= 65.0.0",
+            "wheel",
             "versioningit",]
 build-backend = "setuptools.build_meta"
 

From 589045bd98a4233333db84891c4eaf20709802bf Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 09:46:08 +0000
Subject: [PATCH 06/11] Move pins

---
 .github/actions/publish-package/action.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml
index 76c8ddd7..20016509 100644
--- a/.github/actions/publish-package/action.yml
+++ b/.github/actions/publish-package/action.yml
@@ -24,9 +24,7 @@ runs:
       conda config --set always_yes yes --set changeps1 no
       conda create -n build-env
       conda activate build-env
-      mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
-      mamba install wheel=0.44.0
-      mamba install setuptools=75.1.0
+      mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa wheel=0.44.0 setuptools=75.1.0
       conda config --add channels mantid/label/nightly
       conda config --add channels mantid
 

From 0beafe0babdd407259763b82f12d8b97c4f0c71d Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 10:11:06 +0000
Subject: [PATCH 07/11] Pin setuptools to 75.1.0

---
 .github/actions/publish-package/action.yml | 2 +-
 conda/conda_build_config.yaml              | 3 +++
 conda/meta.yaml                            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml
index 20016509..f6cfbc39 100644
--- a/.github/actions/publish-package/action.yml
+++ b/.github/actions/publish-package/action.yml
@@ -24,7 +24,7 @@ runs:
       conda config --set always_yes yes --set changeps1 no
       conda create -n build-env
       conda activate build-env
-      mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa wheel=0.44.0 setuptools=75.1.0
+      mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
       conda config --add channels mantid/label/nightly
       conda config --add channels mantid
 
diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
index 15919a78..4bc9203e 100644
--- a/conda/conda_build_config.yaml
+++ b/conda/conda_build_config.yaml
@@ -1,2 +1,5 @@
 python:
   - 3.12
+
+setuptools:
+  - 75.1.0
diff --git a/conda/meta.yaml b/conda/meta.yaml
index c9be521a..0116cb3f 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -21,7 +21,7 @@ requirements:
   build:
     - python {{ python }}
     - qtpy
-    - setuptools
+    - setuptools {{ setuptools }}
     - versioningit
 
   run:

From 7184e62686ce7d4929468822a4e43c8fd72d09f5 Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 10:34:57 +0000
Subject: [PATCH 08/11] Pin setuptools also in pyproject.toml

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 118adce8..4409cce6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 65.0.0",
+requires = ["setuptools == 75.1.0", # >= 65.0.0",
             "wheel",
             "versioningit",]
 build-backend = "setuptools.build_meta"

From 4759f890adec3d01f698ef329d0ea5734922c827 Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 10:45:44 +0000
Subject: [PATCH 09/11] Pin setuptools also in actions

---
 .github/actions/publish-package/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml
index f6cfbc39..5e88f8c4 100644
--- a/.github/actions/publish-package/action.yml
+++ b/.github/actions/publish-package/action.yml
@@ -22,7 +22,7 @@ runs:
     shell: bash -l {0}
     run: |
       conda config --set always_yes yes --set changeps1 no
-      conda create -n build-env
+      conda create -n build-env setuptools=75.1.0
       conda activate build-env
       mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
       conda config --add channels mantid/label/nightly

From e18bf0c362a01664f273a01a257b54e5d5e06c70 Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Wed, 20 Nov 2024 10:55:42 +0000
Subject: [PATCH 10/11] Pin setuptools in mamba install

---
 .github/actions/publish-package/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml
index 5e88f8c4..aba3151e 100644
--- a/.github/actions/publish-package/action.yml
+++ b/.github/actions/publish-package/action.yml
@@ -22,9 +22,9 @@ runs:
     shell: bash -l {0}
     run: |
       conda config --set always_yes yes --set changeps1 no
-      conda create -n build-env setuptools=75.1.0
+      conda create -n build-env
       conda activate build-env
-      mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
+      mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa setuptools=75.1.0
       conda config --add channels mantid/label/nightly
       conda config --add channels mantid
 

From 6cc887467673c110a0ce357035a483f7ab862a8d Mon Sep 17 00:00:00 2001
From: Silke Schomann <silke.schomann@stfc.ac.uk>
Date: Fri, 22 Nov 2024 13:59:30 +0000
Subject: [PATCH 11/11] Remove temporary modifications

---
 .github/actions/publish-package/action.yml |  2 +-
 .github/workflows/deploy_conda_nightly.yml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/actions/publish-package/action.yml b/.github/actions/publish-package/action.yml
index aba3151e..f6cfbc39 100644
--- a/.github/actions/publish-package/action.yml
+++ b/.github/actions/publish-package/action.yml
@@ -24,7 +24,7 @@ runs:
       conda config --set always_yes yes --set changeps1 no
       conda create -n build-env
       conda activate build-env
-      mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa setuptools=75.1.0
+      mamba install -c conda-forge mamba conda-build anaconda-client conda-verify boa
       conda config --add channels mantid/label/nightly
       conda config --add channels mantid
 
diff --git a/.github/workflows/deploy_conda_nightly.yml b/.github/workflows/deploy_conda_nightly.yml
index c35ee1ea..6a240873 100644
--- a/.github/workflows/deploy_conda_nightly.yml
+++ b/.github/workflows/deploy_conda_nightly.yml
@@ -1,11 +1,11 @@
 name: Deploy MSlice nightly
 
-on: push
-#  workflow_run:
-#    workflows: ["MSlice nightly build"]
-#    branches: [main]
-#    types:
-#      - completed
+on:
+  workflow_run:
+    workflows: ["MSlice nightly build"]
+    branches: [main]
+    types:
+      - completed
 
 jobs:
   build_conda_and_upload:
@@ -26,7 +26,7 @@ jobs:
           echo "recentCommits=$(test -z $(git log --since="yesterday" -1 --format=%h) && echo false || echo true)" >> $GITHUB_ENV
 
       - name: Setup Miniconda
-#        if: ${{ env.recentCommits == 'true'}}
+        if: ${{ env.recentCommits == 'true'}}
         uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -35,7 +35,7 @@ jobs:
           auto-activate-base: false
 
       - name: Build MSlice nightly conda package
-#        if: ${{ env.recentCommits == 'true'}}
+        if: ${{ env.recentCommits == 'true'}}
         uses: ./.github/actions/publish-package
         with:
           label: nightly