mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Try to test against Python 3.5
This commit is contained in:
parent
b3c6f61175
commit
f6856d6687
|
@ -10,6 +10,7 @@ env:
|
||||||
- TOXENV=py32
|
- TOXENV=py32
|
||||||
- TOXENV=py33
|
- TOXENV=py33
|
||||||
- TOXENV=py34
|
- TOXENV=py34
|
||||||
|
- TOXENV=py35
|
||||||
- TOXENV=pypy
|
- TOXENV=pypy
|
||||||
- TOXENV=py27 VENDOR=no
|
- TOXENV=py27 VENDOR=no
|
||||||
- TOXENV=py34 VENDOR=no
|
- TOXENV=py34 VENDOR=no
|
||||||
|
|
|
@ -7,3 +7,9 @@ git config --global user.name "pip"
|
||||||
|
|
||||||
pip install --upgrade setuptools
|
pip install --upgrade setuptools
|
||||||
pip install coverage diff_cover tox
|
pip install coverage diff_cover tox
|
||||||
|
|
||||||
|
# If we're running under Python 3.5, then we need to actually go and install
|
||||||
|
# Python 3.5.
|
||||||
|
if [[ $TOXENV = "py35" ]]; then
|
||||||
|
sudo python-build 3.5-dev /opt/python/3.5-dev
|
||||||
|
fi
|
||||||
|
|
|
@ -2,6 +2,13 @@
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
|
# If we're running under Python 3.5 make sure our Python 3.5 bin directory is
|
||||||
|
# added to the $PATH
|
||||||
|
if [[ $TOXENV = "py35" ]]; then
|
||||||
|
export PATH="/opt/python/3.5-dev/bin:$PATH"
|
||||||
|
export TOXARGS="--assert=plain"
|
||||||
|
fi
|
||||||
|
|
||||||
# We want to create the virtual environment here, but not actually run anything
|
# We want to create the virtual environment here, but not actually run anything
|
||||||
tox --notest
|
tox --notest
|
||||||
|
|
||||||
|
@ -32,14 +39,14 @@ if [[ $VENDOR = "no" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run the unit tests
|
# Run the unit tests
|
||||||
tox -- -m unit --cov pip/ --cov-report xml
|
tox -- -m unit --cov pip/ --cov-report xml $TOXARGS
|
||||||
|
|
||||||
# Run our integration tests
|
# Run our integration tests
|
||||||
# Note: There is an issue with Python 3.2 where concurrent imports will corrupt
|
# Note: There is an issue with Python 3.2 where concurrent imports will corrupt
|
||||||
# the generated .pyc files and we'll get very strange errors. However as
|
# the generated .pyc files and we'll get very strange errors. However as
|
||||||
# long as we continue to run the unit tests first and in a seperate step
|
# long as we continue to run the unit tests first and in a seperate step
|
||||||
# then this should work fine.
|
# then this should work fine.
|
||||||
tox -- -m integration -n 8
|
tox -- -m integration -n 8 $TOXARGS
|
||||||
|
|
||||||
if [[ $TRAVIS_PULL_REQUEST != "false" ]]
|
if [[ $TRAVIS_PULL_REQUEST != "false" ]]
|
||||||
then
|
then
|
||||||
|
|
|
@ -343,6 +343,10 @@ class TestUpgradeDistributeToSetuptools(object):
|
||||||
expect_stderr=True,
|
expect_stderr=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@pytest.mark.skipif(
|
||||||
|
sys.version_info >= (3, 5),
|
||||||
|
reason="distribute doesn't work on Python 3.5",
|
||||||
|
)
|
||||||
def test_from_distribute_6_to_setuptools_7(
|
def test_from_distribute_6_to_setuptools_7(
|
||||||
self, script, data, virtualenv):
|
self, script, data, virtualenv):
|
||||||
self.prep_ve(
|
self.prep_ve(
|
||||||
|
|
Loading…
Reference in a new issue