Imported Upstream version 40.6.2

diff --git a/CHANGES.rst b/CHANGES.rst
index 7a3e8743f25a0020ddc74e6a1c98ea8f06d44218..dc26cb4d482e2cc0eb5dd76d5f28253bbd08c073 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.6.2
+-------
+
+* #1592: Fix invalid dependency on external six module (instead of vendored version).
+
+
 v40.6.1
 -------
 

diff --git a/setup.cfg b/setup.cfg
index 9e12b655d531ba17769a2f586cf85b4194b3c3ac..ace8038854ee7fc91b4b88695ed565a4434f0768 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.6.1
+current_version = 40.6.2
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
index f24b8e746d4bb27b45c134e9faef1a49f11f3a34..44b7edf53f2a1a5376a5335b42b6270e09aabc30 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.6.1",
+    version="40.6.2",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"

diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py
index 3b8cab5e06cf9dc94acf5c28acf87e2b6ad357c7..dd17f7a925b285fa08562b64d7f5f8263efc3a6e 100644 (file)
--- a/setuptools/command/upload.py
+++ b/setuptools/command/upload.py
@@ -12,9 +12,9 @@ from distutils.spawn import spawn
 
 from distutils.errors import DistutilsError
 
-from six.moves.urllib.request import urlopen, Request
-from six.moves.urllib.error import HTTPError
-from six.moves.urllib.parse import urlparse
+from setuptools.extern.six.moves.urllib.request import urlopen, Request
+from setuptools.extern.six.moves.urllib.error import HTTPError
+from setuptools.extern.six.moves.urllib.parse import urlparse
 
 class upload(orig.upload):
     """

diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index 170d27ed087c72db11714cefe33b0f44ea94753a..cf830b437d7954d21bc9758734e287bada2047f0 100644 (file)
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -7,13 +7,12 @@ from setuptools.dist import DistDeprecationWarning, _get_unpatched
 from setuptools import Distribution
 from setuptools.extern.six.moves.urllib.request import pathname2url
 from setuptools.extern.six.moves.urllib_parse import urljoin
+from setuptools.extern import six
 
 from .textwrap import DALS
 from .test_easy_install import make_nspkg_sdist
 
 import pytest
-import six
-
 
 def test_dist_fetch_build_egg(tmpdir):
     """

diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py
index 9229bba17247d1992b0c4b83902e323c41513c9e..cc0e8a0d94204f6f7ff3ee4e3c6f48274778b3a6 100644 (file)
--- a/setuptools/tests/test_upload.py
+++ b/setuptools/tests/test_upload.py
@@ -7,10 +7,10 @@ from distutils.errors import DistutilsError
 from distutils.version import StrictVersion
 
 import pytest
-import six
 
 from setuptools.command.upload import upload
 from setuptools.dist import Distribution
+from setuptools.extern import six
 
 
 def _parse_upload_body(body):

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index e511c9181637f529c56cd71154034173dc362cce..7b5fea1738187d197271836d05875b333cdace2a 100644 (file)
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -1,3 +1,4 @@
+import distutils.command
 import glob
 import os
 import sys
@@ -134,3 +135,14 @@ def test_test_command_install_requirements(bare_virtualenv, tmpdir):
         'python setup.py test -s test',
     )).format(tmpdir=tmpdir))
     assert tmpdir.join('success').check()
+
+
+def test_no_missing_dependencies(bare_virtualenv):
+    """
+    Quick and dirty test to ensure all external dependencies are vendored.
+    """
+    for command in ('upload',):#sorted(distutils.command.__all__):
+        bare_virtualenv.run(' && '.join((
+            'cd {source}',
+            'python setup.py {command} -h',
+        )).format(command=command, source=SOURCE_DIR))

diff --git a/tests/manual_test.py b/tests/manual_test.py
index 52295f9a56d8793d2d612fc737c9ea923a12be14..99db4b0143262ee549aaf3bd333bcfbedd018e7c 100644 (file)
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -8,7 +8,7 @@ import subprocess
 from distutils.command.install import INSTALL_SCHEMES
 from string import Template
 
-from six.moves import urllib
+from setuptools.extern.six.moves import urllib
 
 
 def _system_call(*args):