Merge pull request #1043 from lsst-sqre/tickets/DM-44541

DM-44541: Prepare 11.1.1 release
lsst-sqre · May 24, 2024 · 1fa0c82 · 1fa0c82
2 parents 94d88b5 + 66acccb
commit 1fa0c82
Show file tree

Hide file tree

Showing 10 changed files with 596 additions and 599 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@ Find changes for the upcoming release in the project's [changelog.d directory](h
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-11.1.1'></a>
+## 11.1.1 (2024-05-24)
+
+### Bug fixes
+
+- Respect the enrollmentUrl configuration setting when CILogon is the authentication provider, fixing a problem introduced in the 11.0.0 release.
+- Detect when someone attempts to mark as admin a username that is already an admin and return a 409 error instead of raising an uncaught exception.
+- Return a more-correct 409 HTTP error code, instead of 422, when a user attempts to use a duplicate token name.
+- When creating a new token, try to remove it from Redis if the SQL write fails. This will hopefully reduce the number of orphaned tokens created during SQL server or proxy restarts.
+
 <a id='changelog-11.1.0'></a>
 ## 11.1.0 (2024-05-23)
 

diff --git a/Makefile b/Makefile
@@ -52,6 +52,7 @@ update-deps:
 	    --output-file requirements/dev.txt requirements/dev.in
 	uv pip compile --upgrade --generate-hashes			\
 	    --output-file requirements/tox.txt requirements/tox.in
+	cd ui && npm upgrade --legacy-peer-deps
 
 # Useful for testing against a Git version of Safir.
 .PHONY: update-deps-no-hashes

diff --git a/changelog.d/20240524_114021_rra_DM_44540.md b/changelog.d/20240524_114021_rra_DM_44540.md
diff --git a/changelog.d/20240524_115108_rra_DM_44540.md b/changelog.d/20240524_115108_rra_DM_44540.md
diff --git a/changelog.d/20240524_120600_rra_DM_44541.md b/changelog.d/20240524_120600_rra_DM_44541.md
diff --git a/changelog.d/20240524_124119_rra_DM_44541.md b/changelog.d/20240524_124119_rra_DM_44541.md
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1646,9 +1646,9 @@ types-pyyaml==6.0.12.20240311 \
     --hash=sha256:a9e0f0f88dc835739b0c1ca51ee90d04ca2a897a71af79de9aec5f38cb0a5342 \
     --hash=sha256:b845b06a1c7e54b8e5b4c683043de0d9caf205e7434b3edc678ff2411979b8f6
     # via -r requirements/dev.in
-typing-extensions==4.11.0 \
-    --hash=sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0 \
-    --hash=sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a
+typing-extensions==4.12.0 \
+    --hash=sha256:8cbcdc8606ebcb0d95453ad7dc5065e6237b6aa230a31e81d0f440c30fed5fd8 \
+    --hash=sha256:b349c66bea9016ac22978d800cfff206d5f9816951f12a7d0ec5578b0a819594
     # via
     #   -c requirements/main.txt
     #   mypy

diff --git a/requirements/main.txt b/requirements/main.txt
@@ -1250,9 +1250,9 @@ typer==0.12.3 \
     --hash=sha256:070d7ca53f785acbccba8e7d28b08dcd88f79f1fbda035ade0aecec71ca5c914 \
     --hash=sha256:49e73131481d804288ef62598d97a1ceef3058905aa536a1134f90891ba35482
     # via fastapi-cli
-typing-extensions==4.11.0 \
-    --hash=sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0 \
-    --hash=sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a
+typing-extensions==4.12.0 \
+    --hash=sha256:8cbcdc8606ebcb0d95453ad7dc5065e6237b6aa230a31e81d0f440c30fed5fd8 \
+    --hash=sha256:b349c66bea9016ac22978d800cfff206d5f9816951f12a7d0ec5578b0a819594
     # via
     #   alembic
     #   fastapi

diff --git a/requirements/tox.txt b/requirements/tox.txt
@@ -195,25 +195,24 @@ urllib3==2.2.1 \
     #   -c requirements/main.txt
     #   docker
     #   requests
-uv==0.2.2 \
-    --hash=sha256:3a0a2de910d7d5d0db8bc09771ef1e5904f65af72a48d5565550ec5cfad69d33 \
-    --hash=sha256:3d9d6a2eadf9e9c117d423886ab3eb816648deff6159b5c705bdc908d2765d59 \
-    --hash=sha256:47a57552cb60931e70b4fa00ea68cd63f43603b6090b66707754a5b082f310b0 \
-    --hash=sha256:6408db244a9bdfb604f0ccdf270916453ce83e086d1a2c1f5bb3a55044c2d41b \
-    --hash=sha256:7266c461b8c21a479136cbbdfe042df1739c9534357efc9311c5af9a016ba577 \
-    --hash=sha256:7a2bd719a9ea62e1fb2fbfcff3ce00d6fb49c729a09673eef18af0ae9b58dae7 \
-    --hash=sha256:7bce4fd2a044e1538bc0ab57e482878ae6a9df07f988e44603ac6dd9ca01b484 \
-    --hash=sha256:89183013cbc0fcee1ab88a44937a659b35b57b7a9c2263cdfd71ced8629de777 \
-    --hash=sha256:974990404cfa2416b7623c91613a4a855abbf7bac1cdeb1df2c8ea0cb415d954 \
-    --hash=sha256:a6046d69d7981a9fa577a2b8132531ada8ffdddb8df18e88e71bdced97b0f752 \
-    --hash=sha256:a7f99a4282fe30aa4cde28dd9f0655cebf47225a17ba7f69f34930502f6b68be \
-    --hash=sha256:b565e26f78beef7aa5659c233b458ed5dbd74016fd5555b3812acc3ed8ed53b9 \
-    --hash=sha256:bf7d53233c5fdd891fb130ec85f13228e0862f3ffb1e8b0b545caa3d2a6028fe \
-    --hash=sha256:c84a1d755341e0190d535b8391f77353d5e33b914be7cac19544caaec1bd1be4 \
-    --hash=sha256:e884baf9fdfc7e0f2a9bf402c2126b00dff130c40064314c1ff720716d4ab414 \
-    --hash=sha256:e94378e3ca7cd3645d14654ae4bf18070e00f806bcaf10fec08ec27d2d801e35 \
-    --hash=sha256:e9a94108afacd1ec8e48369a2292d77319edea451ca7c57f29d1d37447081f37 \
-    --hash=sha256:ec2b516cd2734e1a1d209b5c5dfb37cd7b1e0f91c7692cf6d38f3f2799757a5d
+uv==0.2.3 \
+    --hash=sha256:12c25976c0ab62a9d0333afcaf80033dc04695907932a227b5950c9bf716ddee \
+    --hash=sha256:23e3321c9e4d006e6454ae3375c3e6ec71ba0cc9c73394bb4777f1ae8f2ceb2d \
+    --hash=sha256:304fbcd9272c7e81f62a46b9254daf68f7622e38b2a1e450f27f3a7cc9d70fb8 \
+    --hash=sha256:3227894999ae465b4f3b88b60a94500f85f9b479e39b7de1bd1c32db19245252 \
+    --hash=sha256:3b9b077561704f8d0733dc8ea46c084b6113be7618d88b2fadbe111f3986dac1 \
+    --hash=sha256:4a2c04f146c351ef534052472794c68ebd528239c622764c1fe762a6ae8e6e1f \
+    --hash=sha256:5867b54fad22eb8d9052d7c69192844b551fafa5ce6d951d5fd467059cb35b3d \
+    --hash=sha256:6e57a7f92462cd06f0f43112cebc98406eb1a1640345040108c8d7de5b9556ad \
+    --hash=sha256:6ef658ea907963e497c2d6a0a5502eb13796b97b843571d4acd3c8e1f6507d4a \
+    --hash=sha256:7116eac4eb0e7329ce74d95cb7fada29f0623a39ca34357c374877bb00b098f0 \
+    --hash=sha256:79a92bb307d0b62f859a5705880b1433e552db3631405f19bc8862638a54c71f \
+    --hash=sha256:8081eb30b5cde7661eade4d87c80e8876a3b23635e0823e727d98d1b0ce4d883 \
+    --hash=sha256:8108cf952d84bc25062de6402ff5db0485aedeedb2bd87f5e764534ae9ce07e4 \
+    --hash=sha256:882f3b55d298045d7f7b3073f54aa87aafbad10bae4e1a0fdd14807b15a918ca \
+    --hash=sha256:d87ebe10c030ede3598ce560f35a54fe1e14515018fb222707576e5c80d0b6fb \
+    --hash=sha256:de1bc4defcbce6077475f11d21437ac9469b0b641814690cdacf11d36d38aa2c \
+    --hash=sha256:f24700aa936814a682b49f033e64c4e61f360407c4176a4476fcc8ff82868b15
     # via tox-uv
 virtualenv==20.26.2 \
     --hash=sha256:82bf0f4eebbb78d36ddaee0283d43fe5736b53880b8a8cdcd37390a07ac3741c \