summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-07-29 09:37:26 -0400
committerNed Batchelder <ned@nedbatchelder.com>2016-07-29 09:37:26 -0400
commit2fdb151e2ce0ba0693ba97ea08b0e61d3597cd09 (patch)
tree3f96f8e106e4a3d6f22cc21b2f8eb62c3f4e6e62
parentc122b945403216fd89993b98138850d6b9a01488 (diff)
downloadpython-coveragepy-git-2fdb151e2ce0ba0693ba97ea08b0e61d3597cd09.tar.gz
Setuptools fixed their egg-ordering problem, no need for this test workaround any more.
-rw-r--r--requirements/wheel.pip2
-rw-r--r--tests/modules/process_test/try_execfile.py5
-rw-r--r--tox.ini1
3 files changed, 2 insertions, 6 deletions
diff --git a/requirements/wheel.pip b/requirements/wheel.pip
index d915a5bb..cc03d894 100644
--- a/requirements/wheel.pip
+++ b/requirements/wheel.pip
@@ -1,3 +1,3 @@
# Things needed to make wheels for coverage.py
-setuptools==21.1.0
+setuptools==25.1.1
wheel==0.29.0
diff --git a/tests/modules/process_test/try_execfile.py b/tests/modules/process_test/try_execfile.py
index bc412fc5..70905071 100644
--- a/tests/modules/process_test/try_execfile.py
+++ b/tests/modules/process_test/try_execfile.py
@@ -52,11 +52,6 @@ def without_same_files(filenames):
cleaned_sys_path = [os.path.normcase(p) for p in without_same_files(sys.path)]
-# Eggs seems to go in different places for some reason. I'm going to assume
-# it's an OK difference. Sort eggs to the end of the list to canonicalize
-# them.
-cleaned_sys_path = sorted(cleaned_sys_path, key=lambda p: p.endswith(".egg"))
-
DATA = "xyzzy"
import __main__
diff --git a/tox.ini b/tox.ini
index 970a738d..d3f9a30f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,7 @@ usedevelop = True
deps =
# https://requires.io/github/nedbat/coveragepy/requirements/
pip==8.1.2
+ setuptools==25.1.1
nose==1.3.7
mock==2.0.0
PyContracts==1.7.9