From e540b2d9dcc5fc255666fab941cb2d3bbb733cd4 Mon Sep 17 00:00:00 2001 From: Brian Koopman Date: Tue, 10 Feb 2026 15:13:24 -0500 Subject: [PATCH 1/3] Update sotodlib version This is the last commit before Python 3.8 support was dropped. It's the version that socs defines in [1], and what ultimately gets used by the pysmurf-controller agent. [1] - https://github.com/simonsobs/socs/blob/331d46e5e764b53203d20785c48918b335aba47d/requirements.txt#L48 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5a1c30f8..eb67ac64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,4 +11,4 @@ pandas # i.e. when [1] is merged and propagated to [2]. # [1] - https://github.com/simonsobs/smurf_dockers/pull/6 # [2] - https://github.com/simonsobs/socs/blob/main/docker/pysmurf_controller/Dockerfile -sotodlib @ git+https://github.com/simonsobs/sotodlib.git@f3f9a97 +sotodlib @ git+https://github.com/simonsobs/sotodlib.git@5d613d5915b1716c401abecb5446088bce5fc1a4 From a577306f605dca46f572e148bedd65384e1ef355 Mon Sep 17 00:00:00 2001 From: Brian Koopman Date: Tue, 10 Feb 2026 15:14:59 -0500 Subject: [PATCH 2/3] Add pysmurf to requirements file This is a dependency here, but in our current builds is defined over in socs [1]. It really belongs here, where the direct import occurs. [1] - https://github.com/simonsobs/socs/blob/331d46e5e764b53203d20785c48918b335aba47d/requirements.txt#L45 --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index eb67ac64..e48d232b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,6 @@ pandas # [1] - https://github.com/simonsobs/smurf_dockers/pull/6 # [2] - https://github.com/simonsobs/socs/blob/main/docker/pysmurf_controller/Dockerfile sotodlib @ git+https://github.com/simonsobs/sotodlib.git@5d613d5915b1716c401abecb5446088bce5fc1a4 +# pysmurf can be installed from PyPI once [3] is merged and a new release is made +# [3] - https://github.com/slaclab/pysmurf/pull/824 +pysmurf @ git+https://github.com/slaclab/pysmurf.git@main From 66265ed28d2d5c4e16afafcec21d760313eb52a0 Mon Sep 17 00:00:00 2001 From: Brian Koopman Date: Tue, 10 Feb 2026 15:16:39 -0500 Subject: [PATCH 3/3] Add missing dependencies These couple of dependencies were missing from our requirements file, and I suspect are rarely actually used/get installed somewhere else in the chain if they really are needed, but we should define them here. --- pyproject.toml | 10 ++++++++++ requirements.txt | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6a8e8baf..87e714c7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,6 +33,16 @@ dependencies = [ "tqdm", ] +[project.optional-dependencies] +scripts = [ + "ipython", + "traitlets", +] +dev = [ + "pytest", + "setuptools-scm", +] + [project.scripts] jackhammer = "sodetlib.hammers.jackhammer:main" diff --git a/requirements.txt b/requirements.txt index e48d232b..ac7fe691 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,4 @@ tqdm -ipython -setuptools-scm PyYAML numpy scipy @@ -15,3 +13,11 @@ sotodlib @ git+https://github.com/simonsobs/sotodlib.git@5d613d5915b1716c401abec # pysmurf can be installed from PyPI once [3] is merged and a new release is made # [3] - https://github.com/slaclab/pysmurf/pull/824 pysmurf @ git+https://github.com/slaclab/pysmurf.git@main + +# scripts +ipython +traitlets + +# dev +pytest +setuptools-scm