Merge pull request #7643 from pradyunsg/vendoring/update-packaging

Upgrade vendored packaging to 20.1
pypa · Jan 24, 2020 · 2f6cd83 · 2f6cd83
2 parents 1d17df6 + 1cf779c
commit 2f6cd83
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/news/7626.bugfix b/news/7626.bugfix
@@ -0,0 +1 @@
+Fix a regression in generation of compatibility tags.
diff --git a/news/packaging.vendor b/news/packaging.vendor
@@ -0,0 +1 @@
+Upgrade packaging to 20.1
diff --git a/src/pip/_vendor/packaging/__about__.py b/src/pip/_vendor/packaging/__about__.py
@@ -18,7 +18,7 @@
 __summary__ = "Core utilities for Python packages"
 __uri__ = "https://github.com/pypa/packaging"
 
-__version__ = "20.0"
+__version__ = "20.1"
 
 __author__ = "Donald Stufft and individual contributors"
 __email__ = "donald@stufft.io"

diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
@@ -315,7 +315,7 @@ def _py_interpreter_range(py_version):
 def compatible_tags(
     python_version=None,  # type: Optional[PythonVersion]
     interpreter=None,  # type: Optional[str]
-    platforms=None,  # type: Optional[Iterator[str]]
+    platforms=None,  # type: Optional[Iterable[str]]
 ):
     # type: (...) -> Iterator[Tag]
     """
@@ -328,8 +328,7 @@ def compatible_tags(
     """
     if not python_version:
         python_version = sys.version_info[:2]
-    if not platforms:
-        platforms = _platform_tags()
+    platforms = list(platforms or _platform_tags())
     for version in _py_interpreter_range(python_version):
         for platform_ in platforms:
             yield Tag(version, "none", platform_)

diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
@@ -7,7 +7,7 @@ distro==1.4.0
 html5lib==1.0.1
 ipaddress==1.0.23  # Only needed on 2.6 and 2.7
 msgpack==0.6.2
-packaging==20.0
+packaging==20.1
 pep517==0.7.0
 progress==1.5
 pyparsing==2.4.6