Merge pull request #352 from lsst-sqre/tickets/DM-47986

DM-47986: Fix dependency constraints on Safir modules

changelog.d/20241211_163506_rra_DM_47986.md

@@ -0,0 +1,3 @@
+### Bug fixes
+
+- Fix dependencies on safir-logging and safir-arq from the safir PyPI module to allow the latest versions to be installed.

noxfile.py

@@ -20,14 +20,11 @@
 nox.options.default_venv_backend = "uv"
 nox.options.reuse_existing_virtualenvs = True
 
-# pip-installable dependencies for all the Safir modules. The local safir-arq
-# apparently has to be installed after safir itself or the safir dependency
-# resolution appears to replace the local install with the safir-arq package
-# from PyPI.
+# pip-installable dependencies for all the Safir modules.
 PIP_DEPENDENCIES = (
-    ("-e", "./safir[arq,db,dev,gcs,kubernetes,redis,uws]"),
-    ("-e", "./safir-logging"),
     ("-e", "./safir-arq"),
+    ("-e", "./safir-logging"),
+    ("-e", "./safir[arq,db,dev,gcs,kubernetes,redis,uws]"),
 )
 
 

safir/pyproject.toml

@@ -35,15 +35,15 @@ dependencies = [
     "pydantic-core",
     "pydantic-settings!=2.6.0,<3",
     "python-schema-registry-client>=2.6,<3",
-    "safir-logging<7",
+    "safir-logging",
     "starlette<1",
     "structlog>=21.2.0",
 ]
 dynamic = ["version"]
 
 [project.optional-dependencies]
 arq = [
-    "safir-arq<7",
+    "safir-arq",
 ]
 db = [
     "alembic[tz]<2",
@@ -84,7 +84,7 @@ uws = [
     "google-cloud-storage<3",
     "jinja2<4",
     "python-multipart",
-    "safir-arq<7",
+    "safir-arq",
     "vo-models>=0.4.1,<1",
 ]