McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Instead of monkeypatching setuptools on Travis, just upgrade it

Browse source
This commit is contained in:
Donald Stufft 2013-08-23 09:45:03 -04:00
parent fe60a1d5cf
commit 99f520dfa0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -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:

2
tests/unit/test_finder.py
View file

@ -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")