From c8b4b6d4e4b2ea6ee0d46174daef98ee08e70a8ac3b9b9800ad36b69c64a7210 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 11 Apr 2025 07:13:09 +0000 Subject: [PATCH] - Update to version 0.46.0 * Dropped support for Python 3.8 * Removed the bdist_wheel setuptools command implementation and entry point. The wheel.bdist_wheel module is now just an alias to setuptools.command.bdist_wheel, emitting a deprecation warning on import. * Removed vendored packaging in favor of a run-time dependency on it. * Made the wheel.metadata module private (with a deprecation warning if it's imported). * Made the wheel.cli package private (no deprecation warning). * Fixed an exception when calling the convert command with an empty description field. - Drop tests.patch and unskip other fixed tests OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-wheel?expand=0&rev=86 --- python-wheel.changes | 14 +++++ python-wheel.spec | 8 ++- tests.patch | 125 ------------------------------------------- wheel-0.45.1.tar.gz | 3 -- wheel-0.46.0.tar.gz | 3 ++ 5 files changed, 20 insertions(+), 133 deletions(-) delete mode 100644 tests.patch delete mode 100644 wheel-0.45.1.tar.gz create mode 100644 wheel-0.46.0.tar.gz diff --git a/python-wheel.changes b/python-wheel.changes index cc55e63..e27521e 100644 --- a/python-wheel.changes +++ b/python-wheel.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Apr 7 10:50:06 UTC 2025 - Markéta Machová + +- Update to version 0.46.0 + * Dropped support for Python 3.8 + * Removed the bdist_wheel setuptools command implementation and entry point. + The wheel.bdist_wheel module is now just an alias to setuptools.command.bdist_wheel, + emitting a deprecation warning on import. + * Removed vendored packaging in favor of a run-time dependency on it. + * Made the wheel.metadata module private (with a deprecation warning if it's imported). + * Made the wheel.cli package private (no deprecation warning). + * Fixed an exception when calling the convert command with an empty description field. +- Drop tests.patch and unskip other fixed tests + ------------------------------------------------------------------- Thu Mar 27 10:29:43 UTC 2025 - Markéta Machová diff --git a/python-wheel.spec b/python-wheel.spec index 277a516..e694239 100644 --- a/python-wheel.spec +++ b/python-wheel.spec @@ -32,20 +32,19 @@ %endif %{?sle15_python_module_pythons} Name: python-wheel%{psuffix} -Version: 0.45.1 +Version: 0.46.0 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} BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 +Requires: python-packaging %if %{with libalternatives} Requires: alts BuildRequires: alts @@ -99,8 +98,7 @@ export PYTHONPATH=build/env/lib/python%{$python_bin_suffix}/site-packages %if %{with test} export LC_ALL=en_US.utf8 export PYTHONDONTWRITEBYTECODE=1 -# 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)" +%pytest %endif %if !%{with test} diff --git a/tests.patch b/tests.patch deleted file mode 100644 index 49c8b54..0000000 --- a/tests.patch +++ /dev/null @@ -1,125 +0,0 @@ -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.45.1.tar.gz b/wheel-0.45.1.tar.gz deleted file mode 100644 index 290a045..0000000 --- a/wheel-0.45.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:398fe0a1a609b1084bcab897c65596613544fbe6109408e505e29e4ce0c3175d -size 106943 diff --git a/wheel-0.46.0.tar.gz b/wheel-0.46.0.tar.gz new file mode 100644 index 0000000..7380eab --- /dev/null +++ b/wheel-0.46.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:067b4923a66abd49e21d4b0d505215e0aa7b4978babb1f967c4a7c511d3ae8d2 +size 49870