diff --git a/.travis.yml b/.travis.yml index 75a1551ef..d13253d68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,9 @@ before_install: - echo -e "[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> ~/.hgrc - git config --global user.email "python-virtualenv@googlegroups.com" - git config --global user.name "Pip" -install: pip install pytest pytest-xdist git+https://github.com/pypa/virtualenv@develop#egg=virtualenv scripttest>=1.3 mock +install: + - pip install --upgrade setuptools + - pip install pytest pytest-xdist git+https://github.com/pypa/virtualenv@develop#egg=virtualenv scripttest>=1.3 mock # Using -n 8because multiprocessing says a travis box has 16 CPUs (8 is half) script: py.test -n 8 notifications: diff --git a/tests/unit/test_finder.py b/tests/unit/test_finder.py index 9b73b8361..16ea03dae 100644 --- a/tests/unit/test_finder.py +++ b/tests/unit/test_finder.py @@ -93,7 +93,6 @@ class TestWheel: """ Test not finding an unsupported wheel. """ - monkeypatch.setattr(pip.wheel.pkg_resources, "get_distribution", lambda x: Distribution(project_name='setuptools', version='0.9')) monkeypatch.setattr(pip.pep425tags, "supported_tags", [('py1', 'none', 'any')]) req = InstallRequirement.from_line("simple.dist") @@ -106,7 +105,6 @@ class TestWheel: """ Test finding supported wheel. """ - monkeypatch.setattr(pip.wheel.pkg_resources, "get_distribution", lambda x: Distribution(project_name='setuptools', version='0.9')) monkeypatch.setattr(pip.pep425tags, "supported_tags", [('py2', 'none', 'any')]) req = InstallRequirement.from_line("simple.dist")