diff --git a/extra/python-wheel/checksums b/extra/python-wheel/checksums index 28c18f81..32affb1c 100644 --- a/extra/python-wheel/checksums +++ b/extra/python-wheel/checksums @@ -1,2 +1,2 @@ -09346c4b17ede2d4cfb19f389840db97078a211f166da76883dc1c4deb760ea6d2 -fa4390b8c20916f3d49f8fdf859c8cda3b7d2ad0c52c557e959671a7bb16719f7f +5aa16f8a1a9d95e0d0681eec86df9163a5d2520b91eea915619d1a397bac61faf5 +7a9225a4c7bee07e696e7660d4319e5ffdbf0d5573ad6da16362f3fe8648ec1b2d diff --git a/extra/python-wheel/patches/use-system-packaging.patch b/extra/python-wheel/patches/use-system-packaging.patch index 9437d983..c8105a2f 100644 --- a/extra/python-wheel/patches/use-system-packaging.patch +++ b/extra/python-wheel/patches/use-system-packaging.patch @@ -1,7 +1,5 @@ -Upstream vendors packaging, use system packaging instead - diff --git a/setup.py b/setup.py -index 78b124e..e5025c9 100644 +index 05c2d63..7a5efd2 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ @@ -13,46 +11,24 @@ index 78b124e..e5025c9 100644 package_data = \ {'': ['*']} -diff --git a/src/wheel/bdist_wheel.py b/src/wheel/bdist_wheel.py -index 2f93c47..78cdd90 100644 ---- a/src/wheel/bdist_wheel.py -+++ b/src/wheel/bdist_wheel.py -@@ -19,6 +19,7 @@ from email.policy import EmailPolicy - from glob import iglob - from shutil import rmtree - from zipfile import ZIP_DEFLATED, ZIP_STORED -+from packaging import tags - - import setuptools - from setuptools import Command -@@ -27,8 +28,7 @@ from . import __version__ as wheel_version - from .macosx_libfile import calculate_macosx_platform_tag - from .metadata import pkginfo_to_metadata - from .util import log --from .vendored.packaging import tags --from .vendored.packaging import version as _packaging_version -+from packaging import version as _packaging_version - from .wheelfile import WheelFile - - diff --git a/src/wheel/metadata.py b/src/wheel/metadata.py -index b391c96..ffa1706 100644 +index b8098fa..3a17175 100644 --- a/src/wheel/metadata.py +++ b/src/wheel/metadata.py -@@ -12,7 +12,7 @@ from email.message import Message +@@ -13,7 +13,7 @@ from email.message import Message from email.parser import Parser - from typing import Iterator + from typing import Generator, Iterable, Iterator, Literal -from .vendored.packaging.requirements import Requirement +from packaging.requirements import Requirement - def _nonblank(str): + def _nonblank(str: str) -> bool | Literal[""]: diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py -index d202469..95ea27d 100644 +index bb1457a..6e118ef 100644 --- a/tests/test_bdist_wheel.py +++ b/tests/test_bdist_wheel.py -@@ -20,7 +20,7 @@ from wheel.bdist_wheel import ( +@@ -22,7 +22,7 @@ from wheel._bdist_wheel import ( remove_readonly, remove_readonly_exc, ) diff --git a/extra/python-wheel/sources b/extra/python-wheel/sources index 315e5200..4a3773c8 100644 --- a/extra/python-wheel/sources +++ b/extra/python-wheel/sources @@ -1,2 +1,2 @@ -https://files.pythonhosted.org/packages/source/w/wheel/wheel-0.43.0.tar.gz +https://files.pythonhosted.org/packages/source/w/wheel/wheel-0.44.0.tar.gz patches/use-system-packaging.patch diff --git a/extra/python-wheel/version b/extra/python-wheel/version index 752d8123..ca771c57 100644 --- a/extra/python-wheel/version +++ b/extra/python-wheel/version @@ -1 +1 @@ -0.43.0 2 +0.44.0 1