Sync from SUSE:SLFO:Main python-wheel revision 8c77311b4ef101c13271adbd1900211f

This commit is contained in:
2025-05-17 16:14:14 +02:00
parent 5660fefe21
commit e01da60a90
5 changed files with 157 additions and 6 deletions

View File

@@ -1,3 +1,26 @@
-------------------------------------------------------------------
Thu Mar 27 10:29:43 UTC 2025 - Markéta Machová <mmachova@suse.com>
- 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 <dmueller@suse.com>
- 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 <adrian.glaubitz@suse.com>
- 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 <dmueller@suse.com>

View File

@@ -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}

125
tests.patch Normal file
View File

@@ -0,0 +1,125 @@
From 3028d38b5aec19f966660de8e24c45bb5c23f359 Mon Sep 17 00:00:00 2001
From: shenxianpeng <xianpeng.shen@gmail.com>
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"],

BIN
wheel-0.44.0.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
wheel-0.45.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.