Merge branch 'main' into ft/allow-slsa-provenance

requirements/deploy.txt

@@ -86,9 +86,9 @@ importlib-metadata==8.5.0 \
     --hash=sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b \
     --hash=sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7
     # via opentelemetry-api
-opentelemetry-api==1.28.1 \
-    --hash=sha256:6fa7295a12c707f5aebef82da3d9ec5afe6992f3e42bfe7bec0339a44b3518e7 \
-    --hash=sha256:bfe86c95576cf19a914497f439fd79c9553a38de0adbdc26f7cfc46b0c00b16c
+opentelemetry-api==1.28.2 \
+    --hash=sha256:6fcec89e265beb258fe6b1acaaa3c8c705a934bd977b9f534a2b7c0d2d4275a6 \
+    --hash=sha256:ecdc70c7139f17f9b0cf3742d57d7020e3e8315d6cffcdf1a12a905d45b19cc0
     # via ddtrace
 packaging==24.2 \
     --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \

requirements/docs-dev.txt

@@ -395,9 +395,9 @@ sphinxcontrib-serializinghtml==2.0.0 \
     --hash=sha256:6e2cb0eef194e10c27ec0023bfeb25badbbb5868244cf5bc5bdc04e4464bf331 \
     --hash=sha256:e9d912827f872c029017a53f0ef2180b327c3f7fd23c87229f7a8e8b70031d4d
     # via sphinx
-starlette==0.41.2 \
-    --hash=sha256:9834fd799d1a87fd346deb76158668cfa0b0d56f85caefe8268e2d97c3468b62 \
-    --hash=sha256:fbc189474b4731cf30fcef52f18a8d070e3f3b46c6a04c97579e85e6ffca942d
+starlette==0.41.3 \
+    --hash=sha256:0e4ab3d16522a255be6b28260b938eae2482f98ce5cc934cb08dce8dc3ba5835 \
+    --hash=sha256:44cedb2b7c77a9de33a8b74b2b90e9f50d11fcf25d8270ea525ad71a25374ff7
     # via sphinx-autobuild
 urllib3==2.2.3 \
     --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \

requirements/lint.txt

@@ -563,9 +563,9 @@ types-s3transfer==0.10.3 \
     --hash=sha256:d34c5a82f531af95bb550927136ff5b737a1ed3087f90a59d545591dfde5b4cc \
     --hash=sha256:f761b2876ac4c208e6c6b75cdf5f6939009768be9950c545b11b0225e7703ee7
     # via boto3-stubs
-types-setuptools==75.5.0.20241116 \
-    --hash=sha256:1144b2ab8fa986061f963391fdbde16df20582e3cc39c94340e71aa61cc7203f \
-    --hash=sha256:b6939ffdbc50ffdc0bcfbf14f7a6de1ddc5510906c1ca2bd62c23646e5798b1a
+types-setuptools==75.5.0.20241119 \
+    --hash=sha256:2b1ec21346656aeb4f43fa6b70b223b4fa726e324c509a05f35611209f134014 \
+    --hash=sha256:6e7f1937a8b70cc5c724facc619da721b86d47ac673e3eb739e44d36afd260fc
     # via
     #   -r requirements/lint.in
     #   types-babel

warehouse/templates/email/pep625-extension-email/body.html

@@ -28,7 +28,7 @@
     as-is and do not need to be updated.
   </p>
   <p>
-    Specifically, your recent upload of {{ filename }} is incompatible with PEP
+    Specifically, your recent upload of '{{ filename }}' is incompatible with PEP
     625 because it uses the .zip file extension.
   </p>
   <p>

warehouse/templates/email/pep625-extension-email/body.txt

@@ -19,7 +19,7 @@ This email is notifying you of an upcoming deprecation that we have determined m
 
 In the future, PyPI will require all newly uploaded source distribution filenames to comply with PEP 625 (https://peps.python.org/pep-0625/). Any source distributions already uploaded will remain in place as-is and do not need to be updated.
 
-Specifically, your recent upload of {{ filename }} is incompatible with PEP 625 because it uses the .zip extension.
+Specifically, your recent upload of '{{ filename }}' is incompatible with PEP 625 because it uses the .zip extension.
 
 In most cases, this can be resolved by upgrading the version of your build tooling to a later version that supports PEP 625 and produces compliant filenames.
 

warehouse/templates/email/pep625-name-email/body.html

@@ -28,8 +28,8 @@
     as-is and do not need to be updated.
   </p>
   <p>
-    Specifically, your recent upload of {{ filename }} is incompatible with PEP
-    625 because it does not contains the normalized project name
+    Specifically, your recent upload of '{{ filename }}' is incompatible with PEP
+    625 because it does not contain the normalized project name
     '{{ normalized_name }}'.
   </p>
   <p>

warehouse/templates/email/pep625-name-email/body.txt

@@ -19,7 +19,7 @@ This email is notifying you of an upcoming deprecation that we have determined m
 
 In the future, PyPI will require all newly uploaded source distribution filenames to comply with PEP 625 (https://peps.python.org/pep-0625/). Any source distributions already uploaded will remain in place as-is and do not need to be updated.
 
-Specifically, your recent upload of {{ filename }} is incompatible with PEP 625 because it does not contain the normalized project name '{{ normalized_name }}'.
+Specifically, your recent upload of '{{ filename }}' is incompatible with PEP 625 because it does not contain the normalized project name '{{ normalized_name }}'.
 
 In most cases, this can be resolved by upgrading the version of your build tooling to a later version that supports PEP 625 and produces compliant filenames.
 

warehouse/templates/email/pep625-version-email/body.html

@@ -28,7 +28,7 @@
     as-is and do not need to be updated.
   </p>
   <p>
-    Specifically, your recent upload of {{ filename }} is incompatible with PEP
+    Specifically, your recent upload of '{{ filename }}' is incompatible with PEP
     625 because it does not contain the normalized project version
     '{{ normalized_version }}'.
   </p>

warehouse/templates/email/pep625-version-email/body.txt

@@ -19,7 +19,7 @@ This email is notifying you of an upcoming deprecation that we have determined m
 
 In the future, PyPI will require all newly uploaded source distribution filenames to comply with PEP 625 (https://peps.python.org/pep-0625/). Any source distributions already uploaded will remain in place as-is and do not need to be updated.
 
-Specifically, your recent upload of {{ filename }} is incompatible with PEP 625 because it does not contain contain the normalized project version '{{ normalized_version }}'.
+Specifically, your recent upload of '{{ filename }}' is incompatible with PEP 625 because it does not contain contain the normalized project version '{{ normalized_version }}'.
 
 In most cases, this can be resolved by upgrading the version of your build tooling to a later version that supports PEP 625 and produces compliant filenames.