Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-47986: Fix dependency constraints on Safir modules #352

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog.d/20241211_163506_rra_DM_47986.md
Original file line number Diff line number Diff line change
@@ -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.
9 changes: 3 additions & 6 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]"),
)


Expand Down
6 changes: 3 additions & 3 deletions safir/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -84,7 +84,7 @@ uws = [
"google-cloud-storage<3",
"jinja2<4",
"python-multipart",
"safir-arq<7",
"safir-arq",
"vo-models>=0.4.1,<1",
]

Expand Down
Loading