1 files changed, 49 insertions, 7 deletions
diff --git a/main/py3-wheel/use-system-packaging.patch b/main/py3-wheel/use-system-packaging.patch
index 89445665878..9437d983b7d 100644
--- a/main/py3-wheel/use-system-packaging.patch
+++ b/main/py3-wheel/use-system-packaging.patch
@@ -1,21 +1,63 @@
 Upstream vendors packaging, use system packaging instead
 
+diff --git a/setup.py b/setup.py
+index 78b124e..e5025c9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -4,7 +4,7 @@
+ from distutils.core import setup
+ 
+ packages = \
+-['wheel', 'wheel.cli', 'wheel.vendored', 'wheel.vendored.packaging']
++['wheel', 'wheel.cli']
+ 
+ package_data = \
+ {'': ['*']}
 diff --git a/src/wheel/bdist_wheel.py b/src/wheel/bdist_wheel.py
-index 80e43d0..6bb272c 100644
+index 2f93c47..78cdd90 100644
 --- a/src/wheel/bdist_wheel.py
 +++ b/src/wheel/bdist_wheel.py
-@@ -19,13 +19,13 @@ from glob import iglob
+@@ -19,6 +19,7 @@ from email.policy import EmailPolicy
+ from glob import iglob
  from shutil import rmtree
- from sysconfig import get_config_var
  from zipfile import ZIP_DEFLATED, ZIP_STORED
 +from packaging import tags
  
- import pkg_resources
- 
- from .pkginfo import write_pkg_info
+ 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
- from . import __version__ as wheel_version
  
+ 
+diff --git a/src/wheel/metadata.py b/src/wheel/metadata.py
+index b391c96..ffa1706 100644
+--- a/src/wheel/metadata.py
++++ b/src/wheel/metadata.py
+@@ -12,7 +12,7 @@ from email.message import Message
+ from email.parser import Parser
+ from typing import Iterator
+ 
+-from .vendored.packaging.requirements import Requirement
++from packaging.requirements import Requirement
+ 
+ 
+ def _nonblank(str):
+diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py
+index d202469..95ea27d 100644
+--- a/tests/test_bdist_wheel.py
++++ b/tests/test_bdist_wheel.py
+@@ -20,7 +20,7 @@ from wheel.bdist_wheel import (
+     remove_readonly,
+     remove_readonly_exc,
+ )
+-from wheel.vendored.packaging import tags
++from packaging import tags
+ from wheel.wheelfile import WheelFile
+ 
+ DEFAULT_FILES = {