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

1 files changed, 2 insertions, 7 deletions

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