From 3b9eafeb081b02038326677fb47d8b3f193e7507fddbd3d5ebedbe5818bd956b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 25 Jan 2025 20:45:13 +0000 Subject: [PATCH] Accepting request 1240192 from home:ecsos:python - 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 OBS-URL: https://build.opensuse.org/request/show/1240192 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-twine?expand=0&rev=48 --- python-twine.changes | 32 ++++++++++++++++++++ python-twine.spec | 8 +++-- skip-unsupported-Metadata-Version-test.patch | 18 +++++------ twine-5.1.1.tar.gz | 3 -- twine-6.1.0.tar.gz | 3 ++ 5 files changed, 49 insertions(+), 15 deletions(-) delete mode 100644 twine-5.1.1.tar.gz create mode 100644 twine-6.1.0.tar.gz diff --git a/python-twine.changes b/python-twine.changes index 8c0771f..ded7664 100644 --- a/python-twine.changes +++ b/python-twine.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Fri Jan 24 15:30:25 UTC 2025 - ecsos + +- 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 diff --git a/python-twine.spec b/python-twine.spec index e4fd0e1..4cb5b1f 100644 --- a/python-twine.spec +++ b/python-twine.spec @@ -1,7 +1,7 @@ # # spec file for package python-twine # -# Copyright (c) 2024 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 @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-twine -Version: 5.1.1 +Version: 6.1.0 Release: 0 Summary: Collection of utilities for interacting with PyPI License: Apache-2.0 @@ -28,11 +28,13 @@ Patch0: 0001-remove-disable-socket-pytest-opt.patch # PATCH-FIX-UPSTREAM skip-unsupported-Metadata-Version-test.patch gh#pypa/twine#1071 mcepl@suse.com # Skip failing test case Patch1: skip-unsupported-Metadata-Version-test.patch +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.8.1} BuildRequires: %{python_module portend} @@ -59,7 +61,7 @@ Requires: python-rfc3986 >= 1.4.0 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 diff --git a/skip-unsupported-Metadata-Version-test.patch b/skip-unsupported-Metadata-Version-test.patch index b0767b0..aabcdf7 100644 --- a/skip-unsupported-Metadata-Version-test.patch +++ b/skip-unsupported-Metadata-Version-test.patch @@ -2,19 +2,19 @@ tests/test_package.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -Index: twine-5.1.0/tests/test_package.py +Index: twine-6.1.0/tests/test_package.py =================================================================== ---- twine-5.1.0.orig/tests/test_package.py -+++ twine-5.1.0/tests/test_package.py -@@ -384,11 +384,6 @@ def test_fips_metadata_excludes_md5_and_ - "read_data, missing_fields", +--- 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", -- "Name, Version", +- "'102.3' is not a valid metadata version", - id="unsupported Metadata-Version", - ), - pytest.param( - b"Metadata-Version: 2.3\nName: UNKNOWN\nVersion: UNKNOWN\n", - "Name, Version", - id="missing Name and Version", + b"Metadata-Version: 2.3\nName: test-package\nVersion: UNKNOWN\n", + "'UNKNOWN' is invalid for 'version'", + id="invalid Version", diff --git a/twine-5.1.1.tar.gz b/twine-5.1.1.tar.gz deleted file mode 100644 index ea51d73..0000000 --- a/twine-5.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9aa0825139c02b3434d913545c7b847a21c835e11597f5255842d457da2322db -size 225531 diff --git a/twine-6.1.0.tar.gz b/twine-6.1.0.tar.gz new file mode 100644 index 0000000..54b06a8 --- /dev/null +++ b/twine-6.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be324f6272eff91d07ee93f251edf232fc647935dd585ac003539b42404a8dbd +size 168404