summaryrefslogtreecommitdiff
path: root/pkg_resources
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2022-02-12 05:07:54 -0500
committerJason R. Coombs <jaraco@jaraco.com>2022-02-12 05:08:40 -0500
commit30abf4ed16fc0b60858ea1bc67361237b4cc07d5 (patch)
tree46214cfcf79929d4a7a277b3b18759044c452d2d /pkg_resources
parentce9ddd528a9e2507d3ae794f4d26f6a46d06d025 (diff)
downloadpython-setuptools-git-30abf4ed16fc0b60858ea1bc67361237b4cc07d5.tar.gz
Bump packaging to 21.3
Diffstat (limited to 'pkg_resources')
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/INSTALLER (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/INSTALLER)0
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE)0
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE.APACHE (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE.APACHE)0
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE.BSD (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE.BSD)0
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/METADATA (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/METADATA)11
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/RECORD (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/RECORD)28
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/REQUESTED (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/REQUESTED)0
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/WHEEL (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/WHEEL)0
-rw-r--r--pkg_resources/_vendor/packaging-21.3.dist-info/top_level.txt (renamed from pkg_resources/_vendor/packaging-21.2.dist-info/top_level.txt)0
-rw-r--r--pkg_resources/_vendor/packaging/__about__.py2
-rw-r--r--pkg_resources/_vendor/packaging/_musllinux.py2
-rw-r--r--pkg_resources/_vendor/packaging/_structures.py6
-rw-r--r--pkg_resources/_vendor/packaging/specifiers.py30
-rw-r--r--pkg_resources/_vendor/packaging/tags.py15
-rw-r--r--pkg_resources/_vendor/vendored.txt2
15 files changed, 37 insertions, 59 deletions
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/INSTALLER b/pkg_resources/_vendor/packaging-21.3.dist-info/INSTALLER
index a1b589e3..a1b589e3 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/INSTALLER
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/INSTALLER
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE b/pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE
index 6f62d44e..6f62d44e 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE.APACHE b/pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE.APACHE
index f433b1a5..f433b1a5 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE.APACHE
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE.APACHE
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE.BSD b/pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE.BSD
index 42ce7b75..42ce7b75 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/LICENSE.BSD
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/LICENSE.BSD
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/METADATA b/pkg_resources/_vendor/packaging-21.3.dist-info/METADATA
index e8ff54d7..358ace53 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/METADATA
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/METADATA
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: packaging
-Version: 21.2
+Version: 21.3
Summary: Core utilities for Python packages
Home-page: https://github.com/pypa/packaging
Author: Donald Stufft and individual contributors
@@ -26,7 +26,7 @@ Description-Content-Type: text/x-rst
License-File: LICENSE
License-File: LICENSE.APACHE
License-File: LICENSE.BSD
-Requires-Dist: pyparsing (<3,>=2.0.2)
+Requires-Dist: pyparsing (!=3.0.5,>=2.0.2)
packaging
=========
@@ -105,6 +105,13 @@ recent changes and project history.
Changelog
---------
+21.3 - 2021-11-17
+~~~~~~~~~~~~~~~~~
+
+* Add a ``pp3-none-any`` tag (`#311 <https://github.com/pypa/packaging/issues/311>`__)
+* Replace the blank pyparsing 3 exclusion with a 3.0.5 exclusion (`#481 <https://github.com/pypa/packaging/issues/481>`__, `#486 <https://github.com/pypa/packaging/issues/486>`__)
+* Fix a spelling mistake (`#479 <https://github.com/pypa/packaging/issues/479>`__)
+
21.2 - 2021-10-29
~~~~~~~~~~~~~~~~~
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/RECORD b/pkg_resources/_vendor/packaging-21.3.dist-info/RECORD
index ed2291ac..97cace10 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/RECORD
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/RECORD
@@ -1,13 +1,13 @@
-packaging-21.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-packaging-21.2.dist-info/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197
-packaging-21.2.dist-info/LICENSE.APACHE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
-packaging-21.2.dist-info/LICENSE.BSD,sha256=tw5-m3QvHMb5SLNMFqo5_-zpQZY2S8iP8NIYDwAo-sU,1344
-packaging-21.2.dist-info/METADATA,sha256=N4A8uSYrQwV9byem7YuI9OtVkbqiNzFlDhcDVT-suAo,14754
-packaging-21.2.dist-info/RECORD,,
-packaging-21.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-packaging-21.2.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-packaging-21.2.dist-info/top_level.txt,sha256=zFdHrhWnPslzsiP455HutQsqPB6v0KCtNUMtUtrefDw,10
-packaging/__about__.py,sha256=IIRHpOsJlJSgkjq1UoeBoMTqhvNp3gN9FyMb5Kf8El4,661
+packaging-21.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+packaging-21.3.dist-info/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197
+packaging-21.3.dist-info/LICENSE.APACHE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
+packaging-21.3.dist-info/LICENSE.BSD,sha256=tw5-m3QvHMb5SLNMFqo5_-zpQZY2S8iP8NIYDwAo-sU,1344
+packaging-21.3.dist-info/METADATA,sha256=KuKIy6qDLP3svIt6ejCbxBDhvq11ebkgUN55MeyKFyc,15147
+packaging-21.3.dist-info/RECORD,,
+packaging-21.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+packaging-21.3.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+packaging-21.3.dist-info/top_level.txt,sha256=zFdHrhWnPslzsiP455HutQsqPB6v0KCtNUMtUtrefDw,10
+packaging/__about__.py,sha256=ugASIO2w1oUyH8_COqQ2X_s0rDhjbhQC3yJocD03h2c,661
packaging/__init__.py,sha256=b9Kk5MF7KxhhLgcDmiUWukN-LatWFxPdNug0joPhHSk,497
packaging/__pycache__/__about__.cpython-310.pyc,,
packaging/__pycache__/__init__.cpython-310.pyc,,
@@ -21,12 +21,12 @@ packaging/__pycache__/tags.cpython-310.pyc,,
packaging/__pycache__/utils.cpython-310.pyc,,
packaging/__pycache__/version.cpython-310.pyc,,
packaging/_manylinux.py,sha256=XcbiXB-qcjv3bcohp6N98TMpOP4_j3m-iOA8ptK2GWY,11488
-packaging/_musllinux.py,sha256=z5yeG1ygOPx4uUyLdqj-p8Dk5UBb5H_b0NIjW9yo8oA,4378
-packaging/_structures.py,sha256=TMiAgFbdUOPmIfDIfiHc3KFhSJ8kMjof2QS5I-2NyQ8,1629
+packaging/_musllinux.py,sha256=_KGgY_qc7vhMGpoqss25n2hiLCNKRtvz9mCrS7gkqyc,4378
+packaging/_structures.py,sha256=q3eVNmbWJGG_S0Dit_S3Ao8qQqz_5PYTXFAKBZe5yr4,1431
packaging/markers.py,sha256=Fygi3_eZnjQ-3VJizW5AhI5wvo0Hb6RMk4DidsKpOC0,8475
packaging/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
packaging/requirements.py,sha256=rjaGRCMepZS1mlYMjJ5Qh6rfq3gtsCRQUQmftGZ_bu8,4664
-packaging/specifiers.py,sha256=MZ-fYcNL3u7pNrt-6g2EQO7AbRXkjc-SPEYwXMQbLmc,30964
-packaging/tags.py,sha256=vGybAUQYlPKMcukzX_2e65fmafnFFuMbD25naYTEwtc,15710
+packaging/specifiers.py,sha256=LRQ0kFsHrl5qfcFNEEJrIFYsnIHQUJXY9fIsakTrrqE,30110
+packaging/tags.py,sha256=lmsnGNiJ8C4D_Pf9PbM0qgbZvD9kmB9lpZBQUZa3R_Y,15699
packaging/utils.py,sha256=dJjeat3BS-TYn1RrUFVwufUMasbtzLfYRoy_HXENeFQ,4200
packaging/version.py,sha256=_fLRNrFrxYcHVfyo8vk9j8s6JM8N_xsSxVFr6RJyco8,14665
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/REQUESTED b/pkg_resources/_vendor/packaging-21.3.dist-info/REQUESTED
index e69de29b..e69de29b 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/REQUESTED
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/REQUESTED
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/WHEEL b/pkg_resources/_vendor/packaging-21.3.dist-info/WHEEL
index 5bad85fd..5bad85fd 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/WHEEL
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/WHEEL
diff --git a/pkg_resources/_vendor/packaging-21.2.dist-info/top_level.txt b/pkg_resources/_vendor/packaging-21.3.dist-info/top_level.txt
index 748809f7..748809f7 100644
--- a/pkg_resources/_vendor/packaging-21.2.dist-info/top_level.txt
+++ b/pkg_resources/_vendor/packaging-21.3.dist-info/top_level.txt
diff --git a/pkg_resources/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py
index c359122f..3551bc2d 100644
--- a/pkg_resources/_vendor/packaging/__about__.py
+++ b/pkg_resources/_vendor/packaging/__about__.py
@@ -17,7 +17,7 @@ __title__ = "packaging"
__summary__ = "Core utilities for Python packages"
__uri__ = "https://github.com/pypa/packaging"
-__version__ = "21.2"
+__version__ = "21.3"
__author__ = "Donald Stufft and individual contributors"
__email__ = "donald@stufft.io"
diff --git a/pkg_resources/_vendor/packaging/_musllinux.py b/pkg_resources/_vendor/packaging/_musllinux.py
index 85450faf..8ac3059b 100644
--- a/pkg_resources/_vendor/packaging/_musllinux.py
+++ b/pkg_resources/_vendor/packaging/_musllinux.py
@@ -98,7 +98,7 @@ def _get_musl_version(executable: str) -> Optional[_MuslVersion]:
with contextlib.ExitStack() as stack:
try:
f = stack.enter_context(open(executable, "rb"))
- except IOError:
+ except OSError:
return None
ld = _parse_ld_musl_from_elf(f)
if not ld:
diff --git a/pkg_resources/_vendor/packaging/_structures.py b/pkg_resources/_vendor/packaging/_structures.py
index 95154975..90a6465f 100644
--- a/pkg_resources/_vendor/packaging/_structures.py
+++ b/pkg_resources/_vendor/packaging/_structures.py
@@ -19,9 +19,6 @@ class InfinityType:
def __eq__(self, other: object) -> bool:
return isinstance(other, self.__class__)
- def __ne__(self, other: object) -> bool:
- return not isinstance(other, self.__class__)
-
def __gt__(self, other: object) -> bool:
return True
@@ -51,9 +48,6 @@ class NegativeInfinityType:
def __eq__(self, other: object) -> bool:
return isinstance(other, self.__class__)
- def __ne__(self, other: object) -> bool:
- return not isinstance(other, self.__class__)
-
def __gt__(self, other: object) -> bool:
return False
diff --git a/pkg_resources/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py
index ce66bd4a..0e218a6f 100644
--- a/pkg_resources/_vendor/packaging/specifiers.py
+++ b/pkg_resources/_vendor/packaging/specifiers.py
@@ -57,13 +57,6 @@ class BaseSpecifier(metaclass=abc.ABCMeta):
objects are equal.
"""
- @abc.abstractmethod
- def __ne__(self, other: object) -> bool:
- """
- Returns a boolean representing whether or not the two Specifier like
- objects are not equal.
- """
-
@abc.abstractproperty
def prereleases(self) -> Optional[bool]:
"""
@@ -119,7 +112,7 @@ class _IndividualSpecifier(BaseSpecifier):
else ""
)
- return "<{}({!r}{})>".format(self.__class__.__name__, str(self), pre)
+ return f"<{self.__class__.__name__}({str(self)!r}{pre})>"
def __str__(self) -> str:
return "{}{}".format(*self._spec)
@@ -142,17 +135,6 @@ class _IndividualSpecifier(BaseSpecifier):
return self._canonical_spec == other._canonical_spec
- def __ne__(self, other: object) -> bool:
- if isinstance(other, str):
- try:
- other = self.__class__(str(other))
- except InvalidSpecifier:
- return NotImplemented
- elif not isinstance(other, self.__class__):
- return NotImplemented
-
- return self._spec != other._spec
-
def _get_operator(self, op: str) -> CallableOperator:
operator_callable: CallableOperator = getattr(
self, f"_compare_{self._operators[op]}"
@@ -667,7 +649,7 @@ class SpecifierSet(BaseSpecifier):
else ""
)
- return "<SpecifierSet({!r}{})>".format(str(self), pre)
+ return f"<SpecifierSet({str(self)!r}{pre})>"
def __str__(self) -> str:
return ",".join(sorted(str(s) for s in self._specs))
@@ -706,14 +688,6 @@ class SpecifierSet(BaseSpecifier):
return self._specs == other._specs
- def __ne__(self, other: object) -> bool:
- if isinstance(other, (str, _IndividualSpecifier)):
- other = SpecifierSet(str(other))
- elif not isinstance(other, SpecifierSet):
- return NotImplemented
-
- return self._specs != other._specs
-
def __len__(self) -> int:
return len(self._specs)
diff --git a/pkg_resources/_vendor/packaging/tags.py b/pkg_resources/_vendor/packaging/tags.py
index e65890a9..9a3d25a7 100644
--- a/pkg_resources/_vendor/packaging/tags.py
+++ b/pkg_resources/_vendor/packaging/tags.py
@@ -90,7 +90,7 @@ class Tag:
return f"{self._interpreter}-{self._abi}-{self._platform}"
def __repr__(self) -> str:
- return "<{self} @ {self_id}>".format(self=self, self_id=id(self))
+ return f"<{self} @ {id(self)}>"
def parse_tag(tag: str) -> FrozenSet[Tag]:
@@ -192,7 +192,7 @@ def cpython_tags(
if not python_version:
python_version = sys.version_info[:2]
- interpreter = "cp{}".format(_version_nodot(python_version[:2]))
+ interpreter = f"cp{_version_nodot(python_version[:2])}"
if abis is None:
if len(python_version) > 1:
@@ -268,11 +268,11 @@ def _py_interpreter_range(py_version: PythonVersion) -> Iterator[str]:
all previous versions of that major version.
"""
if len(py_version) > 1:
- yield "py{version}".format(version=_version_nodot(py_version[:2]))
- yield "py{major}".format(major=py_version[0])
+ yield f"py{_version_nodot(py_version[:2])}"
+ yield f"py{py_version[0]}"
if len(py_version) > 1:
for minor in range(py_version[1] - 1, -1, -1):
- yield "py{version}".format(version=_version_nodot((py_version[0], minor)))
+ yield f"py{_version_nodot((py_version[0], minor))}"
def compatible_tags(
@@ -481,4 +481,7 @@ def sys_tags(*, warn: bool = False) -> Iterator[Tag]:
else:
yield from generic_tags()
- yield from compatible_tags()
+ if interp_name == "pp":
+ yield from compatible_tags(interpreter="pp3")
+ else:
+ yield from compatible_tags()
diff --git a/pkg_resources/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt
index 0128eb17..d5dbe736 100644
--- a/pkg_resources/_vendor/vendored.txt
+++ b/pkg_resources/_vendor/vendored.txt
@@ -1,4 +1,4 @@
-packaging==21.2
+packaging==21.3
pyparsing==2.2.1
appdirs==1.4.3
jaraco.text==3.7.0