From e01da60a904d2253bbc1645f8587b054b216f6ada69fce7a00bae522a0d01f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 17 May 2025 16:14:14 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-wheel revision 8c77311b4ef101c13271adbd1900211f --- python-wheel.changes | 23 ++++++++ python-wheel.spec | 9 ++-- tests.patch | 125 +++++++++++++++++++++++++++++++++++++++++++ wheel-0.44.0.tar.gz | 3 -- wheel-0.45.1.tar.gz | 3 ++ 5 files changed, 157 insertions(+), 6 deletions(-) create mode 100644 tests.patch delete mode 100644 wheel-0.44.0.tar.gz create mode 100644 wheel-0.45.1.tar.gz diff --git a/python-wheel.changes b/python-wheel.changes index 38f44eb..cc55e63 100644 --- a/python-wheel.changes +++ b/python-wheel.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Mar 27 10:29:43 UTC 2025 - Markéta Machová + +- Add tests.patch to fix (some) tests with setuptools 77 +- Skip license tests failing with setuptools 77 + +------------------------------------------------------------------- +Sat Nov 23 11:03:33 UTC 2024 - Dirk Müller + +- update to 0.45.1: + * Fixed pure Python wheels converted from eggs and wininst + files having the ABI tag in the file name + +------------------------------------------------------------------- +Fri Nov 15 08:22:49 UTC 2024 - John Paul Adrian Glaubitz + +- Update to 0.45.0 + * Refactored the ``convert`` command to not need setuptools to be installed + * Don't configure setuptools logging unless running ``bdist_wheel`` + * Added a redirection from ``wheel.bdist_wheel.bdist_wheel`` to + ``setuptools.command.bdist_wheel.bdist_wheel`` to improve compatibility with + ``setuptools``' latest fixes. + ------------------------------------------------------------------- Sun Sep 8 13:41:41 UTC 2024 - Dirk Müller diff --git a/python-wheel.spec b/python-wheel.spec index 666a0c4..277a516 100644 --- a/python-wheel.spec +++ b/python-wheel.spec @@ -1,7 +1,7 @@ # # spec file for package python-wheel # -# 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 @@ -32,13 +32,15 @@ %endif %{?sle15_python_module_pythons} Name: python-wheel%{psuffix} -Version: 0.44.0 +Version: 0.45.1 Release: 0 Summary: A built-package format for Python License: MIT Group: Development/Languages/Python URL: https://github.com/pypa/wheel Source: https://github.com/pypa/wheel/archive/%{version}.tar.gz#/wheel-%{version}.tar.gz +# PATCH-FIX-UPSTREAM https://github.com/pypa/wheel/pull/651 fix test failures +Patch: tests.patch # Bootstrap: Don't BuildRequire setuptools or pip here! BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module flit-core} @@ -97,7 +99,8 @@ export PYTHONPATH=build/env/lib/python%{$python_bin_suffix}/site-packages %if %{with test} export LC_ALL=en_US.utf8 export PYTHONDONTWRITEBYTECODE=1 -%pytest +# license tests failing with setuptools 77: https://github.com/pypa/wheel/issues/658 +%pytest -k "not (test_licenses_default or test_licenses_deprecated or test_licenses_override)" %endif %if !%{with test} diff --git a/tests.patch b/tests.patch new file mode 100644 index 0000000..49c8b54 --- /dev/null +++ b/tests.patch @@ -0,0 +1,125 @@ +From 3028d38b5aec19f966660de8e24c45bb5c23f359 Mon Sep 17 00:00:00 2001 +From: shenxianpeng +Date: Sun, 16 Mar 2025 01:35:32 +0800 +Subject: [PATCH] Fixed test failures (#651) + +--- + tests/test_bdist_wheel.py | 4 ++-- + tests/test_tagopt.py | 18 +++++++++--------- + tests/testdata/unicode.dist/setup.py | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py +index fcb2dfc4..21eddd02 100644 +--- a/tests/test_bdist_wheel.py ++++ b/tests/test_bdist_wheel.py +@@ -79,9 +79,9 @@ def test_no_scripts(wheel_paths): + + + def test_unicode_record(wheel_paths): +- path = next(path for path in wheel_paths if "unicode.dist" in path) ++ path = next(path for path in wheel_paths if "unicode_dist" in path) + with ZipFile(path) as zf: +- record = zf.read("unicode.dist-0.1.dist-info/RECORD") ++ record = zf.read("unicode_dist-0.1.dist-info/RECORD") + + assert "åäö_日本語.py".encode() in record + +diff --git a/tests/test_tagopt.py b/tests/test_tagopt.py +index 5335af44..5733e1a9 100644 +--- a/tests/test_tagopt.py ++++ b/tests/test_tagopt.py +@@ -14,7 +14,7 @@ + from setuptools import setup, Extension + + setup( +- name="Test", ++ name="test", + version="1.0", + author_email="author@example.com", + py_modules=["test"], +@@ -63,7 +63,7 @@ def test_default_tag(temp_pkg): + assert dist_dir.is_dir() + wheels = list(dist_dir.iterdir()) + assert len(wheels) == 1 +- assert wheels[0].name == f"Test-1.0-py{sys.version_info[0]}-none-any.whl" ++ assert wheels[0].name == f"test-1.0-py{sys.version_info[0]}-none-any.whl" + assert wheels[0].suffix == ".whl" + + +@@ -76,7 +76,7 @@ def test_build_number(temp_pkg): + assert dist_dir.is_dir() + wheels = list(dist_dir.iterdir()) + assert len(wheels) == 1 +- assert wheels[0].name == f"Test-1.0-1-py{sys.version_info[0]}-none-any.whl" ++ assert wheels[0].name == f"test-1.0-1-py{sys.version_info[0]}-none-any.whl" + assert wheels[0].suffix == ".whl" + + +@@ -89,7 +89,7 @@ def test_explicit_tag(temp_pkg): + assert dist_dir.is_dir() + wheels = list(dist_dir.iterdir()) + assert len(wheels) == 1 +- assert wheels[0].name.startswith("Test-1.0-py32-") ++ assert wheels[0].name.startswith("test-1.0-py32-") + assert wheels[0].suffix == ".whl" + + +@@ -101,7 +101,7 @@ def test_universal_tag(temp_pkg): + assert dist_dir.is_dir() + wheels = list(dist_dir.iterdir()) + assert len(wheels) == 1 +- assert wheels[0].name.startswith("Test-1.0-py2.py3-") ++ assert wheels[0].name.startswith("test-1.0-py2.py3-") + assert wheels[0].suffix == ".whl" + + +@@ -114,7 +114,7 @@ def test_universal_beats_explicit_tag(temp_pkg): + assert dist_dir.is_dir() + wheels = list(dist_dir.iterdir()) + assert len(wheels) == 1 +- assert wheels[0].name.startswith("Test-1.0-py2.py3-") ++ assert wheels[0].name.startswith("test-1.0-py2.py3-") + assert wheels[0].suffix == ".whl" + + +@@ -129,7 +129,7 @@ def test_universal_in_setup_cfg(temp_pkg): + assert dist_dir.is_dir() + wheels = list(dist_dir.iterdir()) + assert len(wheels) == 1 +- assert wheels[0].name.startswith("Test-1.0-py2.py3-") ++ assert wheels[0].name.startswith("test-1.0-py2.py3-") + assert wheels[0].suffix == ".whl" + + +@@ -144,7 +144,7 @@ def test_pythontag_in_setup_cfg(temp_pkg): + assert dist_dir.is_dir() + wheels = list(dist_dir.iterdir()) + assert len(wheels) == 1 +- assert wheels[0].name.startswith("Test-1.0-py32-") ++ assert wheels[0].name.startswith("test-1.0-py32-") + assert wheels[0].suffix == ".whl" + + +@@ -157,7 +157,7 @@ def test_legacy_wheel_section_in_setup_cfg(temp_pkg): + assert dist_dir.is_dir() + wheels = list(dist_dir.iterdir()) + assert len(wheels) == 1 +- assert wheels[0].name.startswith("Test-1.0-py2.py3-") ++ assert wheels[0].name.startswith("test-1.0-py2.py3-") + assert wheels[0].suffix == ".whl" + + +diff --git a/tests/testdata/unicode.dist/setup.py b/tests/testdata/unicode.dist/setup.py +index ec66d1e6..46ef0a10 100644 +--- a/tests/testdata/unicode.dist/setup.py ++++ b/tests/testdata/unicode.dist/setup.py +@@ -3,7 +3,7 @@ + from setuptools import setup + + setup( +- name="unicode.dist", ++ name="unicode_dist", + version="0.1", + description="A testing distribution \N{SNOWMAN}", + packages=["unicodedist"], diff --git a/wheel-0.44.0.tar.gz b/wheel-0.44.0.tar.gz deleted file mode 100644 index cf0d1ea..0000000 --- a/wheel-0.44.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a98adedb1f4b409c4aa211fbe4bbc1d687a2b7cf66cfe3079fc3140b2e4e0ce1 -size 100556 diff --git a/wheel-0.45.1.tar.gz b/wheel-0.45.1.tar.gz new file mode 100644 index 0000000..290a045 --- /dev/null +++ b/wheel-0.45.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:398fe0a1a609b1084bcab897c65596613544fbe6109408e505e29e4ce0c3175d +size 106943