diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-23 10:32:22 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-23 10:32:22 -0500 |
commit | 089cdeb489a0fa94d11b7307b54210ef9aa40511 (patch) | |
tree | ee738b703f1b0737e139b5d10f62e54bd20e1028 /setuptools/tests/test_egg_info.py | |
parent | aaec654d804cb78dbb6391afff721a63f26a71cd (diff) | |
parent | 11676d39c405672270a543bdc32de395b935b869 (diff) | |
download | external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.gz external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.bz2 external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.zip |
Merge pull request #933 from pypa/feature/581-depend-not-bundle
Bundle dependencies instead of vendoring them
Diffstat (limited to 'setuptools/tests/test_egg_info.py')
-rw-r--r-- | setuptools/tests/test_egg_info.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py index a32b981d..c9a4425a 100644 --- a/setuptools/tests/test_egg_info.py +++ b/setuptools/tests/test_egg_info.py @@ -6,7 +6,7 @@ import sys from setuptools.command.egg_info import egg_info, manifest_maker from setuptools.dist import Distribution -from setuptools.extern.six.moves import map +from six.moves import map import pytest |