From 10df67dae045599d4687ac5a225e5a0bf311f033 Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <webknjaz@redhat.com>
Date: Wed, 22 Jan 2025 13:35:03 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20Enable=20support=20for=20PEP=206?=
 =?UTF-8?q?39=20metadata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is achieved by upgrading Twine to v6.1.0. Prior to this version,
Twine was unable to pick up and publish licensing information declared
in the new `License-Expression` core packaging metadata [[1]] [[2]].
And now it does that.

Resolves #325.

[1]: https://packaging.python.org/en/latest/specifications/core-metadata/#license-expression
[2]: https://peps.python.org/pep-0639/#spdx
---
 requirements/runtime-constraints.in | 5 -----
 requirements/runtime.in             | 4 ++--
 requirements/runtime.txt            | 7 ++-----
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/requirements/runtime-constraints.in b/requirements/runtime-constraints.in
index e4afedd..3781170 100644
--- a/requirements/runtime-constraints.in
+++ b/requirements/runtime-constraints.in
@@ -13,8 +13,3 @@
 #      remain in Git.                                                         #
 #                                                                             #
 ###############################################################################
-
-# NOTE: 1.12.0 and later enable support for metadata 2.4
-# NOTE: This can be dropped once twine stops using pkginfo
-# Ref: https://github.com/pypa/twine/pull/1180
-pkginfo >= 1.12.0
diff --git a/requirements/runtime.in b/requirements/runtime.in
index 5861e0b..5c01a09 100644
--- 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
index ac8be5d..9b39e76 100644
--- 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
@@ -71,10 +72,6 @@ packaging==24.1
     #   -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 +138,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