Commit 4ae526d5 authored by Donald Stufft's avatar Donald Stufft

Always use the vendored copy of packaging

parent a15a276e
......@@ -75,14 +75,9 @@ try:
except ImportError:
pass
try:
import packaging.version
import packaging.specifiers
except ImportError:
# fallback to vendored version
import setuptools._vendor.packaging.version
import setuptools._vendor.packaging.specifiers
packaging = setuptools._vendor.packaging
import setuptools._vendor.packaging.version
import setuptools._vendor.packaging.specifiers
packaging = setuptools._vendor.packaging
# For compatibility, expose packaging.version.parse as parse_version
parse_version = packaging.version.parse
......
......@@ -8,12 +8,9 @@ import tempfile
import shutil
from unittest import TestCase
try:
import packaging.version
except ImportError:
# fallback to vendored version
import setuptools._vendor.packaging.version
packaging = setuptools._vendor.packaging
import setuptools._vendor.packaging.version
import setuptools._vendor.packaging.specifiers
packaging = setuptools._vendor.packaging
import pkg_resources
from pkg_resources import (parse_requirements, VersionConflict, parse_version,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment