From 1512cd9f3e5dfb0498e91e687069671e07292d78 Mon Sep 17 00:00:00 2001
From: Benjamin Labrecque <labrecque.benji@gmail.com>
Date: Thu, 30 Jul 2026 14:50:22 +0200
Subject: [PATCH] Numpy versioning and sls2om

---
 pixi.lock                                     | 57 +++++++++++--------
 pixi.toml                                     |  3 +-
 services/dbpm3curr/current/app/pyproject.toml |  2 +-
 .../injectionguard/current/app/pyproject.toml |  2 +-
 services/nturns/current/app/pyproject.toml    |  2 +-
 .../postmortemlog/current/app/pyproject.toml  |  2 +-
 services/scrubbing/current/app/pyproject.toml |  2 +-
 services/taubpm/current/app/pyproject.toml    |  2 +-
 services/taupct/current/app/pyproject.toml    |  2 +-
 services/timing/current/app/pyproject.toml    |  2 +-
 services/topuptool/current/app/pyproject.toml |  2 +-
 services/tune/current/app/pyproject.toml      |  2 +-
 services/tunebump/current/app/pyproject.toml  |  2 +-
 services/tunefbx/current/app/pyproject.toml   |  2 +-
 services/tunefby/current/app/pyproject.toml   |  2 +-
 15 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/pixi.lock b/pixi.lock
index 006436c..570b5a2 100644
--- a/pixi.lock
+++ b/pixi.lock
@@ -95,7 +95,7 @@ environments:
       - conda: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-3.10.9-py310hff52083_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.10.9-py310hfde16b3_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.6-hdb14827_0.conda
-      - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-2.2.6-py310hefbff90_0.conda
+      - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py310hb13e2d6_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.4-h55fea9a_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/openldap-2.6.13-hbde042b_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.6.3-h35e630c_0.conda
@@ -191,6 +191,7 @@ environments:
       - pypi: https://files.pythonhosted.org/packages/e5/6d/b53b99a9f2766d095985947a5782f1702cabb129a34f7a802d7197af832f/tzdata-2026.3-py2.py3-none-any.whl
       - pypi: https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl
       - pypi: https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl
+      - pypi: https://gitea.psi.ch/api/packages/sls/pypi/files/sls2om/0.4.0/sls2om-0.4.0-py3-none-any.whl
   test:
     channels:
     - url: https://conda.anaconda.org/conda-forge/
@@ -276,7 +277,7 @@ environments:
       - conda: https://conda.anaconda.org/conda-forge/linux-64/mysql-common-9.0.1-h266115a_6.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-9.0.1-he0572af_6.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.6-hdb14827_0.conda
-      - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-2.2.6-py310hefbff90_0.conda
+      - conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py310hb13e2d6_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.4-h55fea9a_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/openldap-2.6.10-he970967_0.conda
       - conda: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.6.3-h35e630c_0.conda
@@ -378,6 +379,7 @@ environments:
       - pypi: https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl
       - pypi: https://files.pythonhosted.org/packages/e5/6d/b53b99a9f2766d095985947a5782f1702cabb129a34f7a802d7197af832f/tzdata-2026.3-py2.py3-none-any.whl
       - pypi: https://files.pythonhosted.org/packages/ec/dd/96da98f892250475bdf2328112d7468abdd4acc7b902b6af23f4ed958ea0/pytz-2026.2-py2.py3-none-any.whl
+      - pypi: https://gitea.psi.ch/api/packages/sls/pypi/files/sls2om/0.4.0/sls2om-0.4.0-py3-none-any.whl
 packages:
 - conda: https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-20_gnu.conda
   build_number: 20
@@ -2030,16 +2032,15 @@ packages:
     - ncurses >=6.6,<7.0a0
   size: 918956
   timestamp: 1777422145199
-- conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-2.2.6-py310hefbff90_0.conda
-  sha256: 0ba94a61f91d67413e60fa8daa85627a8f299b5054b0eff8f93d26da83ec755e
-  md5: b0cea2c364bf65cd19e023040eeab05d
+- conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py310hb13e2d6_0.conda
+  sha256: 028fe2ea8e915a0a032b75165f11747770326f3d767e642880540c60a3256425
+  md5: 6593de64c935768b6bad3e19b3e978be
   depends:
-  - __glibc >=2.17,<3.0.a0
   - libblas >=3.9.0,<4.0a0
   - libcblas >=3.9.0,<4.0a0
-  - libgcc >=13
+  - libgcc-ng >=12
   - liblapack >=3.9.0,<4.0a0
-  - libstdcxx >=13
+  - libstdcxx-ng >=12
   - python >=3.10,<3.11.0a0
   - python_abi 3.10.* *_cp310
   constrains:
@@ -2050,9 +2051,9 @@ packages:
   - pkg:pypi/numpy?source=hash-mapping
   run_exports:
     weak:
-    - numpy >=1.21,<3
-  size: 7893263
-  timestamp: 1747545075833
+    - numpy >=1.26.4,<2.0a0
+  size: 7009070
+  timestamp: 1707225917496
 - conda: https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.4-h55fea9a_0.conda
   sha256: 3900f9f2dbbf4129cf3ad6acf4e4b6f7101390b53843591c53b00f034343bc4d
   md5: 11b3379b191f63139e29c0d19dee24cd
@@ -3232,14 +3233,14 @@ packages:
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.0.2
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: ./services/injectionguard/current/app
   name: agebd-injectionguard
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.0.2
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: ./services/master/current/app
   name: agebd-master
@@ -3253,7 +3254,7 @@ packages:
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.0.2
+  - numpy>=1.22.6,<2.0.0
   - scipy>=1.13.1
   requires_python: ==3.10.*
 - pypi: ./services/orbitbump/current/app
@@ -3276,7 +3277,7 @@ packages:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
   - matplotlib>=3.10.9
-  - numpy>=2.0.2
+  - numpy>=1.22.6,<2.0.0
   - urllib3>=2.7.0
   requires_python: ==3.10.*
 - pypi: ./services/scrubbing/current/app
@@ -3284,7 +3285,7 @@ packages:
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.2.6
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: ./services/shifttool/current/app
   name: agebd-shifttool
@@ -3297,28 +3298,28 @@ packages:
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.0.2
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: ./services/taupct/current/app
   name: agebd-taupct
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.2.6
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: ./services/timing/current/app
   name: agebd-timing
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.2.6
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: ./services/topuptool/current/app
   name: agebd-topuptool
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.2.6
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: ./services/tune/current/app
   name: agebd-tune
@@ -3326,7 +3327,7 @@ packages:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
   - nafflib>=2.1.1
-  - numpy>=2.2.6
+  - numpy>=1.22.6,<2.0.0
   - scikit-learn>=1.7.2
   - scipy>=1.15.2
   requires_python: ==3.10.*
@@ -3335,7 +3336,7 @@ packages:
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.2.6
+  - numpy>=1.22.6,<2.0.0
   - scipy>=1.15.2
   requires_python: ==3.10.*
 - pypi: ./services/tunefbx/current/app
@@ -3343,14 +3344,14 @@ packages:
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.2.6
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: ./services/tunefby/current/app
   name: agebd-tunefby
   requires_dist:
   - agebd @ ./packages/agebd
   - pyepics>=3.5.8
-  - numpy>=2.2.6
+  - numpy>=1.22.6,<2.0.0
   requires_python: ==3.10.*
 - pypi: https://files.pythonhosted.org/packages/01/0d/3d563dfc173916d5c0cc1fe614cdf312877540b9cea5bcd50a271ba5f6a3/nafflib-2.1.1.tar.gz
   name: nafflib
@@ -3658,3 +3659,11 @@ packages:
   requires_dist:
   - colorama>=0.4.6 ; extra == 'windows-terminal'
   requires_python: '>=3.9'
+- pypi: https://gitea.psi.ch/api/packages/sls/pypi/files/sls2om/0.4.0/sls2om-0.4.0-py3-none-any.whl
+  name: sls2om
+  version: 0.4.0
+  sha256: 42ed695403849438650e69eb61d37be452f99cf8d2ce89fb4f9f9525f49be1e4
+  index: https://gitea.psi.ch/api/packages/sls/pypi/simple/
+  requires_dist:
+  - numpy>=1.22.3,<2.0.0
+  requires_python: '>=3.9'
diff --git a/pixi.toml b/pixi.toml
index b574f56..4a578c9 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -9,12 +9,13 @@ version = "0.1.0"
 
 [dependencies]
 python = "3.10.*"
-numpy = ">=2.2.6,<3"
+numpy = ">=1.22.6,<2"
 scipy = ">=1.15.2,<2"
 matplotlib = ">=3.10.9,<4"
 
 [pypi-dependencies]
 agebd = { path = "packages/agebd", editable = true }
+sls2om = { version = "==0.4.0", index = "https://gitea.psi.ch/api/packages/sls/pypi/simple/" }
 agebd-dbpm3curr = { path = "services/dbpm3curr/current/app", editable = true }
 agebd-injectionguard = { path = "services/injectionguard/current/app", editable = true }
 agebd-master = { path = "services/master/current/app", editable = true }
diff --git a/services/dbpm3curr/current/app/pyproject.toml b/services/dbpm3curr/current/app/pyproject.toml
index 9969f38..a97ebe4 100644
--- a/services/dbpm3curr/current/app/pyproject.toml
+++ b/services/dbpm3curr/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.0.2",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]
diff --git a/services/injectionguard/current/app/pyproject.toml b/services/injectionguard/current/app/pyproject.toml
index 0885f3f..3dd57b5 100644
--- a/services/injectionguard/current/app/pyproject.toml
+++ b/services/injectionguard/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.0.2",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]
diff --git a/services/nturns/current/app/pyproject.toml b/services/nturns/current/app/pyproject.toml
index 13230ee..cee79cf 100644
--- a/services/nturns/current/app/pyproject.toml
+++ b/services/nturns/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.0.2",
+    "numpy>=1.22.6,<2.0.0",
     "scipy>=1.13.1",
 ]
 
diff --git a/services/postmortemlog/current/app/pyproject.toml b/services/postmortemlog/current/app/pyproject.toml
index c80ecbe..e4ecacc 100644
--- a/services/postmortemlog/current/app/pyproject.toml
+++ b/services/postmortemlog/current/app/pyproject.toml
@@ -7,7 +7,7 @@ dependencies = [
     "agebd",
     "pyepics>=3.5.8",
     "matplotlib>=3.10.9",
-    "numpy>=2.0.2",
+    "numpy>=1.22.6,<2.0.0",
     "urllib3>=2.7.0",
 ]
 
diff --git a/services/scrubbing/current/app/pyproject.toml b/services/scrubbing/current/app/pyproject.toml
index 48b5c9a..266a82f 100644
--- a/services/scrubbing/current/app/pyproject.toml
+++ b/services/scrubbing/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.2.6",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]
diff --git a/services/taubpm/current/app/pyproject.toml b/services/taubpm/current/app/pyproject.toml
index 9b549f6..f8e6ac2 100644
--- a/services/taubpm/current/app/pyproject.toml
+++ b/services/taubpm/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.0.2",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]
diff --git a/services/taupct/current/app/pyproject.toml b/services/taupct/current/app/pyproject.toml
index 468df8d..bf25983 100644
--- a/services/taupct/current/app/pyproject.toml
+++ b/services/taupct/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.2.6",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]
diff --git a/services/timing/current/app/pyproject.toml b/services/timing/current/app/pyproject.toml
index 1723540..36c204c 100644
--- a/services/timing/current/app/pyproject.toml
+++ b/services/timing/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.2.6",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]
diff --git a/services/topuptool/current/app/pyproject.toml b/services/topuptool/current/app/pyproject.toml
index a573cd2..a161dfa 100644
--- a/services/topuptool/current/app/pyproject.toml
+++ b/services/topuptool/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.2.6",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]
diff --git a/services/tune/current/app/pyproject.toml b/services/tune/current/app/pyproject.toml
index e98e667..9b277a8 100644
--- a/services/tune/current/app/pyproject.toml
+++ b/services/tune/current/app/pyproject.toml
@@ -7,7 +7,7 @@ dependencies = [
     "agebd",
     "pyepics>=3.5.8",
     "nafflib>=2.1.1",
-    "numpy>=2.2.6",
+    "numpy>=1.22.6,<2.0.0",
     "scikit-learn>=1.7.2",
     "scipy>=1.15.2",
 ]
diff --git a/services/tunebump/current/app/pyproject.toml b/services/tunebump/current/app/pyproject.toml
index a5cda5f..f6962d7 100644
--- a/services/tunebump/current/app/pyproject.toml
+++ b/services/tunebump/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.2.6",
+    "numpy>=1.22.6,<2.0.0",
     "scipy>=1.15.2",
 ]
 
diff --git a/services/tunefbx/current/app/pyproject.toml b/services/tunefbx/current/app/pyproject.toml
index 8577af6..d1086a3 100644
--- a/services/tunefbx/current/app/pyproject.toml
+++ b/services/tunefbx/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.2.6",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]
diff --git a/services/tunefby/current/app/pyproject.toml b/services/tunefby/current/app/pyproject.toml
index aca04d1..a3816b5 100644
--- a/services/tunefby/current/app/pyproject.toml
+++ b/services/tunefby/current/app/pyproject.toml
@@ -6,7 +6,7 @@ requires-python = "==3.10.*"
 dependencies = [
     "agebd",
     "pyepics>=3.5.8",
-    "numpy>=2.2.6",
+    "numpy>=1.22.6,<2.0.0",
 ]
 
 [dependency-groups]