package/python/python-wheel/use-system-packaging.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/python-wheel/use-system-packaging.patch
   3 # Copyright (C) 2024 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This patch file is dual-licensed. It is available under the license the
   9 # patched project is licensed under, as long as it is an OpenSource license
  10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  11 # of the GNU General Public License version 2 as used by the T2 SDE.
  12 # --- T2-COPYRIGHT-NOTE-END ---
  13
  14 Upstream vendors packaging, use system packaging instead
  15
  16 diff --git a/setup.py b/setup.py
  17 index 78b124e..e5025c9 100644
  18 --- a/setup.py
  19 +++ b/setup.py
  20 @@ -4,7 +4,7 @@
  21  from distutils.core import setup
  22
  23  packages = \
  24 -['wheel', 'wheel.cli', 'wheel.vendored', 'wheel.vendored.packaging']
  25 +['wheel', 'wheel.cli']
  26
  27  package_data = \
  28  {'': ['*']}
  29 diff --git a/src/wheel/bdist_wheel.py b/src/wheel/bdist_wheel.py
  30 index 2f93c47..78cdd90 100644
  31 --- a/src/wheel/bdist_wheel.py
  32 +++ b/src/wheel/bdist_wheel.py
  33 @@ -19,6 +19,7 @@ from email.policy import EmailPolicy
  34  from glob import iglob
  35  from shutil import rmtree
  36  from zipfile import ZIP_DEFLATED, ZIP_STORED
  37 +from packaging import tags
  38
  39  import setuptools
  40  from setuptools import Command
  41 @@ -27,8 +28,7 @@ from . import __version__ as wheel_version
  42  from .macosx_libfile import calculate_macosx_platform_tag
  43  from .metadata import pkginfo_to_metadata
  44  from .util import log
  45 -from .vendored.packaging import tags
  46 -from .vendored.packaging import version as _packaging_version
  47 +from packaging import version as _packaging_version
  48  from .wheelfile import WheelFile
  49
  50
  51 diff --git a/src/wheel/metadata.py b/src/wheel/metadata.py
  52 index b391c96..ffa1706 100644
  53 --- a/src/wheel/metadata.py
  54 +++ b/src/wheel/metadata.py
  55 @@ -12,7 +12,7 @@ from email.message import Message
  56  from email.parser import Parser
  57  from typing import Iterator
  58
  59 -from .vendored.packaging.requirements import Requirement
  60 +from packaging.requirements import Requirement
  61
  62
  63  def _nonblank(str):
  64 diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py
  65 index d202469..95ea27d 100644
  66 --- a/tests/test_bdist_wheel.py
  67 +++ b/tests/test_bdist_wheel.py
  68 @@ -20,7 +20,7 @@ from wheel.bdist_wheel import (
  69      remove_readonly,
  70      remove_readonly_exc,
  71  )
  72 -from wheel.vendored.packaging import tags
  73 +from packaging import tags
  74  from wheel.wheelfile import WheelFile
  75
  76  DEFAULT_FILES = {