diff options
-rw-r--r-- | pkg_resources/__init__.py | 6 | ||||
-rw-r--r-- | pkg_resources/_vendor/__init__.py (renamed from setuptools/_vendor/__init__.py) | 0 | ||||
-rw-r--r-- | pkg_resources/_vendor/packaging/__about__.py (renamed from setuptools/_vendor/packaging/__about__.py) | 0 | ||||
-rw-r--r-- | pkg_resources/_vendor/packaging/__init__.py (renamed from setuptools/_vendor/packaging/__init__.py) | 0 | ||||
-rw-r--r-- | pkg_resources/_vendor/packaging/_compat.py (renamed from setuptools/_vendor/packaging/_compat.py) | 0 | ||||
-rw-r--r-- | pkg_resources/_vendor/packaging/_structures.py (renamed from setuptools/_vendor/packaging/_structures.py) | 0 | ||||
-rw-r--r-- | pkg_resources/_vendor/packaging/specifiers.py (renamed from setuptools/_vendor/packaging/specifiers.py) | 0 | ||||
-rw-r--r-- | pkg_resources/_vendor/packaging/version.py (renamed from setuptools/_vendor/packaging/version.py) | 0 | ||||
-rw-r--r-- | pkg_resources/_vendor/vendored.txt (renamed from setuptools/_vendor/vendored.txt) | 0 | ||||
-rwxr-xr-x | setuptools/command/egg_info.py | 4 | ||||
-rw-r--r-- | setuptools/dist.py | 4 | ||||
-rw-r--r-- | setuptools/tests/test_resources.py | 6 |
12 files changed, 10 insertions, 10 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 3a8edca5..699ac114 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -75,9 +75,9 @@ try: except ImportError: pass -import setuptools._vendor.packaging.version -import setuptools._vendor.packaging.specifiers -packaging = setuptools._vendor.packaging +import pkg_resources._vendor.packaging.version +import pkg_resources._vendor.packaging.specifiers +packaging = pkg_resources._vendor.packaging class PEP440Warning(RuntimeWarning): diff --git a/setuptools/_vendor/__init__.py b/pkg_resources/_vendor/__init__.py index e69de29b..e69de29b 100644 --- a/setuptools/_vendor/__init__.py +++ b/pkg_resources/_vendor/__init__.py diff --git a/setuptools/_vendor/packaging/__about__.py b/pkg_resources/_vendor/packaging/__about__.py index d3e50f1e..d3e50f1e 100644 --- a/setuptools/_vendor/packaging/__about__.py +++ b/pkg_resources/_vendor/packaging/__about__.py diff --git a/setuptools/_vendor/packaging/__init__.py b/pkg_resources/_vendor/packaging/__init__.py index c39a8eab..c39a8eab 100644 --- a/setuptools/_vendor/packaging/__init__.py +++ b/pkg_resources/_vendor/packaging/__init__.py diff --git a/setuptools/_vendor/packaging/_compat.py b/pkg_resources/_vendor/packaging/_compat.py index 5c396cea..5c396cea 100644 --- a/setuptools/_vendor/packaging/_compat.py +++ b/pkg_resources/_vendor/packaging/_compat.py diff --git a/setuptools/_vendor/packaging/_structures.py b/pkg_resources/_vendor/packaging/_structures.py index 0ae9bb52..0ae9bb52 100644 --- a/setuptools/_vendor/packaging/_structures.py +++ b/pkg_resources/_vendor/packaging/_structures.py diff --git a/setuptools/_vendor/packaging/specifiers.py b/pkg_resources/_vendor/packaging/specifiers.py index 80225786..80225786 100644 --- a/setuptools/_vendor/packaging/specifiers.py +++ b/pkg_resources/_vendor/packaging/specifiers.py diff --git a/setuptools/_vendor/packaging/version.py b/pkg_resources/_vendor/packaging/version.py index 8d779a48..8d779a48 100644 --- a/setuptools/_vendor/packaging/version.py +++ b/pkg_resources/_vendor/packaging/version.py diff --git a/setuptools/_vendor/vendored.txt b/pkg_resources/_vendor/vendored.txt index 723e026b..723e026b 100644 --- a/setuptools/_vendor/vendored.txt +++ b/pkg_resources/_vendor/vendored.txt diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index e1324127..dfbab0e9 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -15,8 +15,8 @@ try: import packaging.version except ImportError: # fallback to vendored version - import setuptools._vendor.packaging.version - packaging = setuptools._vendor.packaging + import pkg_resources._vendor.packaging.version + packaging = pkg_resources._vendor.packaging from setuptools import Command from setuptools.command.sdist import sdist diff --git a/setuptools/dist.py b/setuptools/dist.py index e44796fd..2daa2835 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -17,8 +17,8 @@ try: import packaging.version except ImportError: # fallback to vendored version - import setuptools._vendor.packaging.version - packaging = setuptools._vendor.packaging + import pkg_resources._vendor.packaging.version + packaging = pkg_resources._vendor.packaging from setuptools.depends import Require from setuptools.compat import basestring, PY2 diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 1902fb2c..7cf2385b 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -8,9 +8,9 @@ import tempfile import shutil from unittest import TestCase -import setuptools._vendor.packaging.version -import setuptools._vendor.packaging.specifiers -packaging = setuptools._vendor.packaging +import pkg_resources._vendor.packaging.version +import pkg_resources._vendor.packaging.specifiers +packaging = pkg_resources._vendor.packaging import pkg_resources from pkg_resources import (parse_requirements, VersionConflict, parse_version, |