Setuptools now uses the 'packaging' package from pkg_resources, unifying the behavior around resolution of that package.

4 files changed, 13 insertions, 21 deletions

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 699ac114..a055cf1a 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -75,9 +75,14 @@ try:
 except ImportError:
     pass
 
-import pkg_resources._vendor.packaging.version
-import pkg_resources._vendor.packaging.specifiers
-packaging = pkg_resources._vendor.packaging
+try:
+    import packaging.version
+    import packaging.specifiers
+except ImportError:
+    # fallback to vendored version
+    import pkg_resources._vendor.packaging.version
+    import pkg_resources._vendor.packaging.specifiers
+    packaging = pkg_resources._vendor.packaging
 
 
 class PEP440Warning(RuntimeWarning):
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index dfbab0e9..88ab0b82 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -11,13 +11,6 @@ import os
 import re
 import sys
 
-try:
-    import packaging.version
-except ImportError:
-    # fallback to vendored version
-    import pkg_resources._vendor.packaging.version
-    packaging = pkg_resources._vendor.packaging
-
 from setuptools import Command
 from setuptools.command.sdist import sdist
 from setuptools.compat import basestring, PY3, StringIO
@@ -28,6 +21,7 @@ from pkg_resources import (
     safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
 import setuptools.unicode_utils as unicode_utils
 
+from pkg_resources import packaging
 
 class egg_info(Command):
     description = "create a distribution's .egg-info directory"
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 2daa2835..7a94d4b3 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -13,18 +13,13 @@ from distutils.core import Distribution as _Distribution
 from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
-try:
-    import packaging.version
-except ImportError:
-    # fallback to vendored version
-    import pkg_resources._vendor.packaging.version
-    packaging = pkg_resources._vendor.packaging
-
 from setuptools.depends import Require
 from setuptools.compat import basestring, PY2
 from setuptools import windows_support
 import pkg_resources
 
+packaging = pkg_resources.packaging
+
 
 def _get_unpatched(cls):
     """Protect against re-patching the distutils if reloaded
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 7cf2385b..f9f2e459 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -8,15 +8,13 @@ import tempfile
 import shutil
 from unittest import TestCase
 
-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,
     Distribution, EntryPoint, Requirement, safe_version, safe_name,
     WorkingSet)
 
+packaging = pkg_resources.packaging
+
 from setuptools.command.easy_install import (get_script_header, is_sh,
     nt_quote_arg)
 from setuptools.compat import StringIO, iteritems, PY3