Merge pull request #180 from lsst-sqre/tickets/DM-49067

DM-49067: Prepare 3.1.0 release

Author: rra

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.9.7
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

CHANGELOG.md

@@ -6,6 +6,13 @@ Find changes for the upcoming release in the project's [changelog.d directory](h
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-3.1.0'></a>
+## 3.1.0 (2025-02-20)
+
+### New features
+
+- Use `lsst.daf.butler` to parse Butler URIs rather than doing the parsing internally. This adds support for the new Butler URI format that will be used for future data releases.
+
 <a id='changelog-3.0.0'></a>
 ## 3.0.0 (2024-08-02)
 

Dockerfile

@@ -12,7 +12,7 @@
 #   - Runs a non-root user.
 #   - Sets up the entrypoint and port.
 
-FROM python:3.13.1-slim-bookworm as base-image
+FROM python:3.13.2-slim-bookworm as base-image
 
 # Update system packages
 COPY scripts/install-base-packages.sh .
@@ -21,7 +21,7 @@ RUN ./install-base-packages.sh && rm ./install-base-packages.sh
 FROM base-image AS install-image
 
 # Install uv.
-COPY --from=ghcr.io/astral-sh/uv:0.5.11 /uv /bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.6.2 /uv /bin/uv
 
 # Install system packages only needed for building dependencies.
 COPY scripts/install-dependency-packages.sh .

requirements/dev.txt

@@ -1,8 +1,8 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile --universal --generate-hashes --output-file requirements/tox.txt requirements/tox.in
-cachetools==5.5.0 \
-    --hash=sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292 \
-    --hash=sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a
+cachetools==5.5.1 \
+    --hash=sha256:70f238fbba50383ef62e55c6aff6d9673175fe59f7c6782c7a0b9e38f4a9df95 \
+    --hash=sha256:b76651fdc3b24ead3c648bbdeeb940c1b04d365b38b4af66788f9ec4a81d42bb
     # via tox
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
@@ -19,9 +19,9 @@ distlib==0.3.9 \
     --hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
     --hash=sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403
     # via virtualenv
-filelock==3.16.1 \
-    --hash=sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0 \
-    --hash=sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435
+filelock==3.17.0 \
+    --hash=sha256:533dc2f7ba78dc2f0f531fc6c4940addf7b70a481e269a5a3b93be94ffbe8338 \
+    --hash=sha256:ee4e77401ef576ebb38cd7f13b9b28893194acc20a8e68e18730ba9c0e54660e
     # via
     #   tox
     #   virtualenv
@@ -46,40 +46,41 @@ pluggy==1.5.0 \
     # via
     #   -c requirements/dev.txt
     #   tox
-pyproject-api==1.8.0 \
-    --hash=sha256:3d7d347a047afe796fd5d1885b1e391ba29be7169bd2f102fcd378f04273d228 \
-    --hash=sha256:77b8049f2feb5d33eefcc21b57f1e279636277a8ac8ad6b5871037b243778496
+pyproject-api==1.9.0 \
+    --hash=sha256:326df9d68dea22d9d98b5243c46e3ca3161b07a1b9b18e213d1e24fd0e605766 \
+    --hash=sha256:7e8a9854b2dfb49454fae421cb86af43efbb2b2454e5646ffb7623540321ae6e
     # via tox
-tox==4.23.2 \
-    --hash=sha256:452bc32bb031f2282881a2118923176445bac783ab97c874b8770ab4c3b76c38 \
-    --hash=sha256:86075e00e555df6e82e74cfc333917f91ecb47ffbc868dcafbd2672e332f4a2c
+tox==4.24.1 \
+    --hash=sha256:083a720adbc6166fff0b7d1df9d154f9d00bfccb9403b8abf6bc0ee435d6a62e \
+    --hash=sha256:57ba7df7d199002c6df8c2db9e6484f3de6ca8f42013c083ea2d4d1e5c6bdc75
     # via
     #   -r requirements/tox.in
     #   tox-uv
-tox-uv==1.16.2 \
-    --hash=sha256:06d9c4c1a41c9d0cde472f111276c31b97aa7bf50abfa0bf6e17c0de891bdba9 \
-    --hash=sha256:57d4c00cfd7973f2d3ebb1ca2ecbf18599c47aa080253355a742de44430cc58b
+tox-uv==1.24.1 \
+    --hash=sha256:77e447177f7eabb5cc066639fc834df01f36f2aac7c7b84b4a8b194318a98eef \
+    --hash=sha256:bffaa804af328b080e41d4bd23ba7d2c4f11926e6956bd698cb85006cc1d0713
     # via -r requirements/tox.in
-uv==0.5.11 \
-    --hash=sha256:08c660c69e7dd874b52ad96b597b57e9f999659f3d9827cdbad884a68e48f7e9 \
-    --hash=sha256:164e068ebdf1177c8863c870bb68e411105b44d53cd91e3b9d8f5fd9202420d8 \
-    --hash=sha256:1fe74893f77f343a43bcfaee2600b63f99a26a82568cfe16d0d1b5a77d9b033f \
-    --hash=sha256:398eb87ef23b0cd25a8bfcc0dddf0d360d92aba03f660962f447a6585ced440b \
-    --hash=sha256:48a3bcbc480d5f922145cd2c68182dcb11effa3ca9f5a9ae9b2f6ce21f9ade32 \
-    --hash=sha256:4bd0c2868dde8ddef89b9e33a85913e450bb71b834f6d73b525e450e840639c8 \
-    --hash=sha256:6094ca4c5f917d58f884011416bb15066e222ef8d0494f26b0156ac97ad6810b \
-    --hash=sha256:736c9b8c86b18eb4dded22cd0f61cc0302bf387de860806c6700b561a4bb95f9 \
-    --hash=sha256:7d1e78c010cf112ddd02d704579e6501c3104a34c944c01f618fc417d6fd55a8 \
-    --hash=sha256:7d2571f175ded2631220c4586e3e14e93952db4a681d0ca094e6cc4124001a83 \
-    --hash=sha256:914dd829808e5d65bf261cbfbb8a01ee80f7d90bc8c9e54f2fc5aa2501f5eec1 \
-    --hash=sha256:9c2d455db44cc5de70e359e88da9659397f52e78190a9a8922defdee7ed26787 \
-    --hash=sha256:a2461a563e28b75cc3b396ed910feecac9518a90c49ac312b1a9da77bae10911 \
-    --hash=sha256:bac233c1e3ae343d0904f78e4a18ca0b479d304aa8de2175df9d72b76dd7764e \
-    --hash=sha256:cefa3ec37f83acdcb4b067ef09622a78e56a22fc6376f5705cd64435bc9bc280 \
-    --hash=sha256:d24d4e816010b692d1180b69eb8aef1d16657a43b5e2edab8be71a2e700ccf9f \
-    --hash=sha256:e1f6a7d727e86deb67d0a4df669de8c03033cd19ed23d27c7113abd7cb0b9bd7
+uv==0.6.2 \
+    --hash=sha256:0f1e8e15c92607862e72e0467a31947af7b9aef93924072e9b4d5dcb5633d374 \
+    --hash=sha256:1db90b728a173926e2018b89df776a373b1e50520466f61e0dbf05f9a64a6db5 \
+    --hash=sha256:27ecb8f6ef796220062f31a12e2dc5dc7a14704aa1df0da2dfa3530346c7e3cc \
+    --hash=sha256:2c13ca920d87dc00721a86ac3d19667cff5435b369d21e3d6df76b373d8fa8df \
+    --hash=sha256:326aff8c4fb8153e2384e79904c27b1c9d4c3a5879b53a6fbc2da3283fda321d \
+    --hash=sha256:52b7452f4c523b9875de53ba73df87acd1cdea36640281d0d80c8074eda42f16 \
+    --hash=sha256:5337cdb6ecc604d0cf36fe6799dd0479111b606009e6c29685d213c74eb40373 \
+    --hash=sha256:7dd26dabd918e5648ecf94fb7c0787db954237e34ea3bdd944b98d007b44c3a5 \
+    --hash=sha256:9e2e421947ef889e6c8913992c560d611826464eabc78f8f702a5eff824aabc7 \
+    --hash=sha256:b435687e5c26a64858ea842fbb4b35ced8e8741a99d1b75d0c0143462e956db9 \
+    --hash=sha256:b8763f310a473f46c0226f5e08a876bd34de121ac370cc7294a5397a13a18d8a \
+    --hash=sha256:d23fb9cd41aecb31845e884d0bfde243e04e763abeab3532138321b4ebe7437c \
+    --hash=sha256:d501ae16fb33969b12a64ac7b9c49d672b8c3964026c5dcaee3b1dcd50a6a22c \
+    --hash=sha256:d696a4f3d4a3ac1b305255e8814ae3a147ea3428a977bb3b4335a339941799bc \
+    --hash=sha256:df0a1d95fd1539c05de434259fafcee0b6852900d4178e94b3b6b6b06438b60c \
+    --hash=sha256:f24e119d338bae32b5a604585b7b518036fba556e2c2d9dbd2d7cf1411213b57 \
+    --hash=sha256:f2f0dc9a0564b31d4efdee317c176a23bbe7e61aec6d281a331ba6ae32f828ff \
+    --hash=sha256:f3719da2e59403783eab634a6238b90051fc65379e02c10b9ca1b32b26d35f77
     # via tox-uv
-virtualenv==20.28.0 \
-    --hash=sha256:23eae1b4516ecd610481eda647f3a7c09aea295055337331bb4e6892ecce47b0 \
-    --hash=sha256:2c9c3262bb8e7b87ea801d715fae4495e6032450c71d2309be9550e7364049aa
+virtualenv==20.29.2 \
+    --hash=sha256:fdaabebf6d03b5ba83ae0a02cfe96f48a716f4fae556461d180825866f75b728 \
+    --hash=sha256:febddfc3d1ea571bdb1dc0f98d7b45d24def7428214d4fb73cc486c9568cce6a
     # via tox

requirements/main.txt

@@ -27,6 +27,7 @@ docstring-code-format = true
 
 [lint]
 ignore = [
+    "A005",     # we always use relative imports so this is not ambiguous
     "ANN401",   # sometimes Any is the right type
     "ARG001",   # unused function arguments are often legitimate
     "ARG002",   # unused method arguments are often legitimate

requirements/tox.txt

@@ -9,8 +9,4 @@ if [ -n "$DATALINKER_TAP_METADATA_URL" ]; then
     unzip -o /tmp/datalink-columns.zip -d "$DATALINKER_TAP_METADATA_DIR"
 fi
 
-rm -rf /tmp/secrets
-cp -RL /etc/butler/secrets /tmp
-chmod -R 0400 /tmp/secrets/*
-
 uvicorn datalinker.main:app --host 0.0.0.0 --port 8080