Sync from SUSE:SLFO:Main python-twine revision 74a309a004a8760fd6664ad1e12a21ec

0001-remove-disable-socket-pytest-opt.patch

@@ -6,8 +6,9 @@ Only in twine-3.4.1: .pytest_cache
 
 --- a/pytest.ini
 +++ b/pytest.ini
-@@ -6,4 +6,3 @@ filterwarnings=
+@@ -6,5 +6,4 @@ filterwarnings=
  	ignore:the imp module is deprecated::setuptools
  
  addopts =
 -	--disable-socket
+ 	--ignore-glob '*integration*.py'

license_files.patch

@@ -1,13 +0,0 @@
----
- setup.cfg |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,5 +1,5 @@
- [metadata]
--license_file = LICENSE
-+license_files = LICENSE
- name = twine
- author = Donald Stufft and individual contributors
- author_email = donald@stufft.io

python-twine.changes

@@ -1,3 +1,77 @@
+-------------------------------------------------------------------
+Sat Jan 25 21:08:56 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
+
+- Add missing Requires.
+
+-------------------------------------------------------------------
+Fri Jan 24 15:30:25 UTC 2025 - ecsos <ecsos@opensuse.org>
+
+- Update to 6.1.0
+  * Features
+    - Twine now has preliminary built-in support for Trusted Publishing as an authentication mechanism. (#1194)
+  * Deprecations and Removals
+    - Remove support for egg and wininst distribution types.
+      These are not accepted by PyPI and not produced by any modern build-backends. (#1195)
+    - Twine no longer supports .tar.bz2 source distributions. (#1200)
+  * Misc
+    - packaging is used instead of pkginfo for parsing and validating metadata.
+      This aligns metadata validation to the one performed by PyPI.
+      packaging  version 24.0 or later is required. Support for metadata version 2.4
+      requires packaging 24.2 or later. pkginfo is not a dependency anymore. (#1180)
+    - Use "source" instead of None as pyversion for sdist uploads. This is what PyPI (and most likely other package indexes) expects. (#1191)
+- Changes from 6.0.1
+  * Bugfixes
+    - Fixed a regression where twine check would fail to expand wildcards, e.g. twine check 'dist/*'. (#1188)
+  * Misc
+    #1184
+- Changes from 6.0.0
+  * Bugfixes
+    - Restore support for pkginfo 1.11 (#1116)
+  * Deprecations and Removals
+    - Username for PyPI and Test PyPI now defaults to __token__ but no longer overrides a username
+      configured in the environment or supplied on the command line. Workflows still supplying
+      anything other than __token__ for the username when uploading to PyPI or Test PyPI will now fail.
+      Either supply __token__ or do not supply a username at all. (#1121)
+  * Misc
+    #1024
+
+-------------------------------------------------------------------
+Thu Nov 14 03:51:14 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Skip a test broken by importlib_metadata 8.5+. 
+
+-------------------------------------------------------------------
+Fri Oct 11 11:50:51 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 5.1.1
+  * Resolve DeprecationWarnings when extracting ``twine`` metadata.
+  * Fix bug for Repository URLs with auth where the port was lost. When attempting
+    to prevent printing authentication credentials in URLs provided with username
+    and password, we did not properly handle the case where the URL also contains
+    a port (when reconstructing the URL). This is now handled and tested to
+    ensure no regressions.
+
+-------------------------------------------------------------------
+Sat Jun 29 12:59:17 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 5.1.0:
+  * Add the experimental --attestations flag.
+
+-------------------------------------------------------------------
+Wed Apr 10 08:39:37 UTC 2024 - Ana Guerrero <ana.guerrero@suse.com>
+
+- Add BuildRequires on python-jaraco.packaging that was pulled
+  by other Build Requires.
+
+-------------------------------------------------------------------
+Mon Mar 18 08:14:45 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Update to 5.0.0:
+  - Use email.message instead of cgi as cgi has been deprecated
+- Remove upstreamed patch license_files.patch
+- Add skip-unsupported-Metadata-Version-test.patch
+  (gh#pypa/twine#1071) to skip failing test case.
+
 -------------------------------------------------------------------
 Fri May  5 13:44:23 UTC 2023 - Matej Cepl <mcepl@suse.com>
 

python-twine.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-twine
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,48 +16,52 @@
 #
 
 
-%define skip_python2 1
 %{?sle15_python_module_pythons}
 Name:           python-twine
-Version:        4.0.2
+Version:        6.1.0
 Release:        0
 Summary:        Collection of utilities for interacting with PyPI
 License:        Apache-2.0
 URL:            https://github.com/pypa/twine
 Source:         https://files.pythonhosted.org/packages/source/t/twine/twine-%{version}.tar.gz
 Patch0:         0001-remove-disable-socket-pytest-opt.patch
-# PATCH-FIX-UPSTREAM license_files.patch gh#pypa/twine!992 mcepl@suse.com
+# PATCH-FIX-UPSTREAM skip-unsupported-Metadata-Version-test.patch gh#pypa/twine#1071 mcepl@suse.com
-# license_file -> license_files
+# Skip failing test case
-Patch1:         license_files.patch
+Patch1:         skip-unsupported-Metadata-Version-test.patch
-BuildRequires:  %{python_module importlib-metadata}
+BuildRequires:  %{python_module id}
+BuildRequires:  %{python_module importlib-metadata >= 3.6}
 BuildRequires:  %{python_module jaraco.envs}
+BuildRequires:  %{python_module jaraco.packaging >= 9}
 BuildRequires:  %{python_module keyring >= 15.1}
 BuildRequires:  %{python_module munch}
+BuildRequires:  %{python_module packaging >= 24.2}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module pkginfo >= 1.4.2}
+BuildRequires:  %{python_module pkginfo >= 1.8.1}
 BuildRequires:  %{python_module portend}
 BuildRequires:  %{python_module pretend}
 BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module readme_renderer >= 21.0}
+BuildRequires:  %{python_module readme_renderer >= 35.0}
 BuildRequires:  %{python_module requests >= 2.20}
 BuildRequires:  %{python_module requests-toolbelt >= 0.8.0}
 BuildRequires:  %{python_module rfc3986 >= 1.4.0}
-BuildRequires:  %{python_module rich}
+BuildRequires:  %{python_module rich >= 12.0.0}
-BuildRequires:  %{python_module setuptools >= 0.7.0}
+BuildRequires:  %{python_module setuptools >= 45}
-BuildRequires:  %{python_module setuptools_scm >= 1.15}
+BuildRequires:  %{python_module setuptools_scm >= 6.0}
+BuildRequires:  %{python_module urllib3 >= 1.26.0}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-importlib-metadata
+Requires:       python-id
 Requires:       python-keyring >= 15.1
-Requires:       python-pkginfo >= 1.4.2
+Requires:       python-packaging
-Requires:       python-readme_renderer >= 21.0
+Requires:       python-readme_renderer >= 35.0
 Requires:       python-requests >= 2.20
 Requires:       python-requests-toolbelt >= 0.8.0
 Requires:       python-rfc3986 >= 1.4.0
-Requires:       python-rich
+Requires:       python-rich >= 12.0.0
+Requires:       python-urllib3 >= 1.26
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 BuildArch:      noarch
 %python_subpackages
 
@@ -84,7 +88,8 @@ sed -i '1s/^#!.*//' twine/__main__.py
 # do not run integration tests
 rm tests/test_integration.py
 # test_check_status_code_for_wrong_repo_url is online test
-%pytest -k 'not test_check_status_code_for_wrong_repo_url'
+# test_package_from_egg broken by importlib_metadata 8.5+
+%pytest -k 'not (test_check_status_code_for_wrong_repo_url or test_package_from_egg)'
 
 %post
 %python_install_alternative twine
@@ -97,6 +102,6 @@ rm tests/test_integration.py
 %license LICENSE
 %python_alternative %{_bindir}/twine
 %{python_sitelib}/twine
-%{python_sitelib}/twine-%{version}*-info
+%{python_sitelib}/twine-%{version}.dist-info
 
 %changelog

skip-unsupported-Metadata-Version-test.patch

@@ -0,0 +1,20 @@
+---
+ tests/test_package.py |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+Index: twine-6.1.0/tests/test_package.py
+===================================================================
+--- twine-6.1.0.orig/tests/test_package.py
++++ twine-6.1.0/tests/test_package.py
+@@ -349,11 +349,6 @@ def test_fips_metadata_excludes_md5_and_
+     "read_data, exception_message",
+     [
+         pytest.param(
+-            b"Metadata-Version: 102.3\nName: test-package\nVersion: 1.0.0\n",
+-            "'102.3' is not a valid metadata version",
+-            id="unsupported Metadata-Version",
+-        ),
+-        pytest.param(
+             b"Metadata-Version: 2.3\nName: test-package\nVersion: UNKNOWN\n",
+             "'UNKNOWN' is invalid for 'version'",
+             id="invalid Version",