Merge pull request #327 from webknjaz/maintenance/twine-6.1-pep639

pypa · Jan 24, 2025 · 1995f2e · 1995f2e
2 parents e0449d2 + 29f40bd
commit 1995f2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/requirements/runtime-constraints.in b/requirements/runtime-constraints.in
@@ -14,7 +14,6 @@
 #                                                                             #
 ###############################################################################
 
-# NOTE: 1.12.0 and later enable support for metadata 2.4
-# NOTE: This can be dropped once twine stops using pkginfo
+# NOTE: Twine 6.1 needs packaging 24.2 to support metadata 2.4
 # Ref: https://github.com/pypa/twine/pull/1180
-pkginfo >= 1.12.0
+packaging >= 24.2
diff --git a/requirements/runtime.in b/requirements/runtime.in
@@ -1,7 +1,7 @@
 -c runtime-constraints.in  # limits known broken versions
 
-# NOTE: v6 is needed to support metadata v2.4
-twine >= 6.0
+# NOTE: v6.1 is needed to support metadata v2.4 including PEP 639
+twine >= 6.1
 
 # NOTE: Used to detect an ambient OIDC credential for OIDC publishing,
 # NOTE: as well as PEP 740 attestations.

diff --git a/requirements/runtime.txt b/requirements/runtime.txt
@@ -38,6 +38,7 @@ id==1.4.0
     # via
     #   -r runtime.in
     #   sigstore
+    #   twine
 idna==3.7
     # via
     #   email-validator
@@ -66,15 +67,12 @@ multidict==6.0.5
     # via grpclib
 nh3==0.2.17
     # via readme-renderer
-packaging==24.1
+packaging==24.2
     # via
+    #   -c runtime-constraints.in
     #   -r runtime.in
     #   pypi-attestations
     #   twine
-pkginfo==1.12.0
-    # via
-    #   -c runtime-constraints.in
-    #   twine
 platformdirs==4.2.2
     # via sigstore
 pyasn1==0.6.0
@@ -141,7 +139,7 @@ six==1.16.0
     # via python-dateutil
 tuf==5.0.0
     # via sigstore
-twine==6.0.1
+twine==6.1.0
     # via -r runtime.in
 typing-extensions==4.11.0
     # via