Merge pull request #200 from lsst-sqre/tickets/DM-52601

rra · web-flow · commit fe44b6d69967 · 2025-09-24T09:10:30.000-07:00
DM-52601: Prepare 4.0.0 release
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,11 +1,11 @@
 version: 2
 updates:
-  - package-ecosystem: "github-actions"
+  - package-ecosystem: "docker"
     directory: "/"
     schedule:
       interval: "weekly"
 
-  - package-ecosystem: "docker"
+  - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,21 +1,27 @@
 name: CI
 
+env:
+  # Current supported uv version. The uv documentation recommends pinning
+  # this. The version should match the version used in .pre-commit-config.yaml
+  # and frozen in uv.lock. It is updated by make update-deps.
+  UV_VERSION: "0.8.22"
+
 "on":
   merge_group: {}
   pull_request: {}
   push:
     branches-ignore:
       # These should always correspond to pull requests, so ignore them for
       # the push trigger and let them be triggered by the pull_request
-      # trigger, avoiding running the workflow twice.  This is a minor
+      # trigger, avoiding running the workflow twice. This is a minor
       # optimization so there's no need to ensure this is comprehensive.
       - "dependabot/**"
       - "gh-readonly-queue/**"
       - "renovate/**"
       - "tickets/**"
       - "u/**"
-    tags:
-      - "*"
+  release:
+    types: [published]
 
 jobs:
   test:
@@ -25,14 +31,16 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version-file: ".python-version"
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: ${{ env.UV_VERSION }}
+
       - name: Run tox
         run: uv run --only-group=tox tox run -e lint,typing,py,coverage-report
 
@@ -42,14 +50,14 @@ jobs:
     timeout-minutes: 10
 
     # Only do Docker builds of tagged releases and pull requests from ticket
-    # branches.  This will still trigger on pull requests from untrusted
+    # branches. This will still trigger on pull requests from untrusted
     # repositories whose branch names match our tickets/* branch convention,
     # but in this case the build will fail with an error since the secret
     # won't be set.
     if: >
-      github.event_name != 'merge_group'
-      && (startsWith(github.ref, 'refs/tags/')
-          || startsWith(github.head_ref, 'tickets/'))
+      (github.event_name == 'release' && github.event.action == 'published')
+      || (github.event_name != 'merge_group'
+          && startsWith(github.head_ref, 'tickets/'))
 
     steps:
       - uses: actions/checkout@v5
diff --git a/.github/workflows/periodic-ci.yaml b/.github/workflows/periodic-ci.yaml
@@ -5,6 +5,12 @@
 
 name: Periodic CI
 
+env:
+  # Current supported uv version. The uv documentation recommends pinning
+  # this. The version should match the version used in .pre-commit-config.yaml
+  # and frozen in uv.lock. It is updated by make update-deps.
+  UV_VERSION: "0.8.22"
+
 "on":
   schedule:
     - cron: "0 12 * * 1"
@@ -18,19 +24,21 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version-file: ".python-version"
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: ${{ env.UV_VERSION }}
+
       - name: Update dependencies
         run: make update-deps
 
       - name: Run tox
-        run: uv run --only-group=tox tox run -e lint,typing,py
+        run: uv run --only-group=tox tox run -e lint,typing,py,coverage-report
 
       - name: Report status
         if: failure()
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,13 +8,13 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.8.21
+    rev: 0.8.22
     hooks:
       - id: uv-lock
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.13.1
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,21 +6,29 @@ Find changes for the upcoming release in the project's [changelog.d directory](h
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-4.0.0'></a>
+## 4.0.0 (2025-09-24)
+
+### Backwards-incompatible changes
+
+- Remove HiPS list support. This has moved to [Repertoire](https://repertoire.lsst.io/).
+- Use service discovery via Repertoire to get the URL of the cutout service. As of this release, Repertoire must be enabled and deployed in the same Phalanx environment for datalinker to work.
+
+### New features
+
+- Add optional support for reporting exceptions to Sentry.
+
 <a id='changelog-3.3.0'></a>
 ## 3.3.0 (2025-06-18)
 
 ### New features
 
-- Change Config to load configuration from local file, to support more complex structures for the hips release data
-- Introduce v2 hips router. Add an additional hips dependency that builds a hips list per data release, given the data release lists and their paths via configuration
-- Add new tests for v2 and legacy hips list endpoint
+- Add new HiPS list routes for the v2 path layout, which provides a separate HiPS tree, with its own list, for each data release.
 
 ### Other changes
 
 - Drop `Expires` from the reply headers of the `{links}` endpoint, since that header is effectively obsolete since HTTP/1.1 given the presence of `Cache-Control` with a `max-age` parameter.
 
-- Upgraded dependencies and python version
-
 <a id='changelog-3.2.0'></a>
 ## 3.2.0 (2025-04-11)
 
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@
 #   - Runs a non-root user.
 #   - Sets up the entrypoint and port.
 
-FROM python:3.13.7-slim-bookworm AS base-image
+FROM python:3.13.7-slim-trixie AS base-image
 
 # Update system packages
 COPY scripts/install-base-packages.sh .
@@ -23,7 +23,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 FROM base-image AS install-image
 
 # Install uv.
-COPY --from=ghcr.io/astral-sh/uv:0.6.14 /uv /bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.8.22 /uv /bin/uv
 
 # Install some additional packages required for building dependencies.
 COPY scripts/install-dependency-packages.sh .
diff --git a/Makefile b/Makefile
@@ -22,3 +22,4 @@ update: update-deps init
 update-deps:
 	uv lock --upgrade
 	uv run --only-group=lint pre-commit autoupdate
+	./scripts/update-uv-version.sh
diff --git a/changelog.d/20250922_134243_rra_DM_52490.md b/changelog.d/20250922_134243_rra_DM_52490.md
diff --git a/changelog.d/20250923_151947_rra_DM_52601.md b/changelog.d/20250923_151947_rra_DM_52601.md
diff --git a/changelog.d/20250923_171313_rra_DM_52601.md b/changelog.d/20250923_171313_rra_DM_52601.md
diff --git a/scripts/update-uv-version.sh b/scripts/update-uv-version.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Update uv version references based on the frozen version from uv.lock.
+
+# Bash "strict mode", to help catch problems and bugs in the shell script.
+# Every bash script you write should include this. See
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/ for details.
+set -euo pipefail
+
+# Determine the current frozen uv version. Since the lint group depends on
+# pre-commit-uv, uv should always be part of its dependencies and thus updated
+# when running uv lock --upgrade, which should be run before this script.
+uv_version=$(uv export -q --no-hashes --only-group lint \
+             | grep ^uv== | sed 's/.*=//')
+
+# Replace the version in the env variables in GitHub Actions workflows.
+for f in .github/workflows/*.yaml; do
+    sed "s/UV_VERSION: .*/UV_VERSION: \"$uv_version\"/" "$f" >"$f.n"
+    if ! cmp -s "$f" "${f}.n"; then
+	echo "Updating UV_VERSION to $uv_version in $f"
+	mv "${f}.n" "$f"
+    else
+        rm "${f}.n"
+    fi
+done
+
+# Replace the version in any Dockerfiles.
+for f in Dockerfile*; do
+    sed "s/uv:[0-9][0-9.]*/uv:$uv_version/" "$f" >"${f}.n"
+    if ! cmp -s "$f" "${f}.n"; then
+        echo "Updating uv container version to $uv_version in $f"
+	mv "${f}.n" "$f"
+    else
+        rm "${f}.n"
+    fi
+done
diff --git a/uv.lock b/uv.lock
