From 021c1073f8f07796548af5998d1d031ce10fcf41 Mon Sep 17 00:00:00 2001
From: Robert Tuck <robert.tuck@diamond.ac.uk>
Date: Wed, 13 Mar 2024 16:34:08 +0000
Subject: [PATCH] (#1254) Fix issue with nexgen semantic versioning constraint
 causing prerelease workflow to fail

---
 .github/workflows/pin_versions.py              | 3 ++-
 .github/workflows/test_data/pip_freeze.txt     | 2 +-
 .github/workflows/test_data/setup.cfg          | 2 +-
 .github/workflows/test_data/setup.cfg.pinned   | 2 +-
 .github/workflows/test_data/setup.cfg.unpinned | 2 +-
 .github/workflows/test_pin_versions.py         | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pin_versions.py b/.github/workflows/pin_versions.py
index 8cf5e3f48..708659856 100755
--- a/.github/workflows/pin_versions.py
+++ b/.github/workflows/pin_versions.py
@@ -8,6 +8,7 @@
 from sys import stderr, stdout
 
 SETUP_CFG_PATTERN = re.compile("(.*?)\\s*(@(.*))?\n")
+SETUP_UNPINNED_PATTERN = re.compile("(.*?)\\s*([<>=]+(.*))?\n")
 PIP = "pip"
 
 
@@ -77,7 +78,7 @@ def write_with_comment(comment, text, output_file):
 
 def update_setup_cfg_line(version_map: dict[str, str], line, output_file):
     stripped_line, comment = strip_comment(line)
-    if match := SETUP_CFG_PATTERN.match(stripped_line):
+    if match := SETUP_UNPINNED_PATTERN.match(stripped_line):
         normalized_name = normalize(match[1].strip())
         if normalized_name not in version_map:
             stderr.write(
diff --git a/.github/workflows/test_data/pip_freeze.txt b/.github/workflows/test_data/pip_freeze.txt
index e1acb1a2c..8f9669f0b 100644
--- a/.github/workflows/test_data/pip_freeze.txt
+++ b/.github/workflows/test_data/pip_freeze.txt
@@ -112,7 +112,7 @@ mypy==1.8.0
 mypy-extensions==1.0.0
 mysql-connector-python==8.3.0
 networkx==3.2.1
-nexgen==0.8.0
+nexgen==0.8.4
 nodeenv==1.8.0
 nose2==0.14.0
 nslsii==0.9.1
diff --git a/.github/workflows/test_data/setup.cfg b/.github/workflows/test_data/setup.cfg
index aa07251c1..327f5227f 100644
--- a/.github/workflows/test_data/setup.cfg
+++ b/.github/workflows/test_data/setup.cfg
@@ -24,7 +24,7 @@ install_requires =
     ispyb
     scanspec
     numpy
-    nexgen @ git+https://github.com/dials/nexgen.git@db4858f6d91a3d07c6c0f815ef752849c0bf79d4
+    nexgen>0.8.3
     opentelemetry-distro
     opentelemetry-exporter-jaeger
     ophyd
diff --git a/.github/workflows/test_data/setup.cfg.pinned b/.github/workflows/test_data/setup.cfg.pinned
index 604ed1339..0a036db5a 100644
--- a/.github/workflows/test_data/setup.cfg.pinned
+++ b/.github/workflows/test_data/setup.cfg.pinned
@@ -24,7 +24,7 @@ install_requires =
     ispyb @ 10.0.0
     scanspec @ 0.6.5
     numpy @ 1.26.3
-    nexgen @ 0.8.0
+    nexgen @ 0.8.4
     opentelemetry-distro @ 0.43b0
     opentelemetry-exporter-jaeger @ 1.21.0
     ophyd @ 1.9.0
diff --git a/.github/workflows/test_data/setup.cfg.unpinned b/.github/workflows/test_data/setup.cfg.unpinned
index eed433078..8b1d37cb8 100644
--- a/.github/workflows/test_data/setup.cfg.unpinned
+++ b/.github/workflows/test_data/setup.cfg.unpinned
@@ -24,7 +24,7 @@ install_requires =
     ispyb
     scanspec
     numpy
-    nexgen
+    nexgen>0.8.3
     opentelemetry-distro
     opentelemetry-exporter-jaeger
     ophyd
diff --git a/.github/workflows/test_pin_versions.py b/.github/workflows/test_pin_versions.py
index 55890bb3c..1a6d41448 100644
--- a/.github/workflows/test_pin_versions.py
+++ b/.github/workflows/test_pin_versions.py
@@ -61,7 +61,7 @@ def test_write_commit_message(mock_stdout, patched_run_pip_freeze):
     installed_versions = pin_versions.fetch_pin_versions()
     pin_versions.write_commit_message(installed_versions)
     mock_stdout.write.assert_called_once_with(
-        "Pin dependencies prior to release. Dodal 1.13.1, nexgen 0.8.0"
+        "Pin dependencies prior to release. Dodal 1.13.1, nexgen 0.8.4"
     )