From 3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 24 Feb 2017 11:49:51 -0500 Subject: Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle" This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing changes made to aaec654d804cb78dbb6391afff721a63f26a71cd. --- tests/requirements.txt | 1 + tests/test_pypi.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/requirements.txt b/tests/requirements.txt index 88a36c63..d07e9cde 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,4 @@ pytest-flake8 pytest>=3.0.2 +setuptools[ssl] backports.unittest_mock>=1.2 diff --git a/tests/test_pypi.py b/tests/test_pypi.py index 173b2c87..b3425e53 100644 --- a/tests/test_pypi.py +++ b/tests/test_pypi.py @@ -2,8 +2,8 @@ import os import subprocess import virtualenv -from six.moves import http_client -from six.moves import xmlrpc_client +from setuptools.extern.six.moves import http_client +from setuptools.extern.six.moves import xmlrpc_client TOP = 200 PYPI_HOSTNAME = 'pypi.python.org' -- cgit v1.2.1