Skip to content

Commit

Permalink
Merge pull request #143 from lsst-sqre/tickets/DM-43846
Browse files Browse the repository at this point in the history
DM-43846: Update dependencies
  • Loading branch information
rra committed Apr 11, 2024
2 parents 2ad0bfe + 0d6405a commit 9da42bc
Show file tree
Hide file tree
Showing 9 changed files with 545 additions and 477 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
with:
python-version: ${{ matrix.python }}
tox-envs: "py,coverage-report,typing"
tox-plugins: tox-uv

build:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/periodic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
with:
python-version: ${{ matrix.python }}
tox-envs: "lint,typing,py"
tox-plugins: tox-uv

- name: Report status
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-merge-conflict
- id: check-toml
- id: check-yaml
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.0
rev: v0.3.6
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# - Runs a non-root user.
# - Sets up the entrypoint and port.

FROM python:3.12.2-slim-bullseye as base-image
FROM python:3.12.2-slim-bookworm as base-image

# Update system packages
COPY scripts/install-base-packages.sh .
Expand Down
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ help:
.PHONY: init
init:
pip install --upgrade uv
uv pip install pre-commit tox
uv pip install --editable .
uv pip install -r requirements/main.txt -r requirements/dev.txt
rm -rf .tox
Expand All @@ -19,9 +18,6 @@ init:
.PHONY: update
update: update-deps init

# The dependencies need --allow-unsafe because pre-commit transitively
# depends on setuptools, which is normally not allowed to appear in a hashed
# dependency file.
.PHONY: update-deps
update-deps:
pip install --upgrade uv
Expand Down
7 changes: 7 additions & 0 deletions changelog.d/20240411_102944_rra_DM_43846.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
### Bug fixes

- Update lsst-resources, hopefully fixing a memory leak.

### Other changes

- Update to the latest Butler client, which may require running an equally new version of the Butler server.
5 changes: 5 additions & 0 deletions requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@

-c main.txt

# Development
pre-commit
tox
tox-uv

# Testing
asgi-lifespan
coverage[toml]
Expand Down
379 changes: 216 additions & 163 deletions requirements/dev.txt

Large diffs are not rendered by default.

619 changes: 312 additions & 307 deletions requirements/main.txt

Large diffs are not rendered by default.

0 comments on commit 9da42bc

Please sign in to comment.