diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/requirements/tests.txt | 10 | ||||
| -rwxr-xr-x | tools/travis/run.sh | 4 | ||||
| -rwxr-xr-x | tools/travis/setup.sh | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/tools/requirements/tests.txt b/tools/requirements/tests.txt index 00a306558..0c84f20aa 100644 --- a/tools/requirements/tests.txt +++ b/tools/requirements/tests.txt @@ -4,13 +4,13 @@ enum34; python_version < '3.4' freezegun mock pretend -pytest==3.8.2 +# pytest 5.x only supports python 3.5+ +pytest<5.0.0 pytest-cov -# Prevent installing 7.0 which has install_requires "pytest >= 3.10". -pytest-rerunfailures<7.0 +# Prevent installing 9.0 which has install_requires "pytest >= 5.0". +pytest-rerunfailures<9.0 pytest-timeout -# Prevent installing 1.28.0 which has install_requires "pytest >= 4.4.0". -pytest-xdist<1.28.0 +pytest-xdist pyyaml setuptools>=39.2.0 # Needed for `setuptools.wheel.Wheel` support. scripttest diff --git a/tools/travis/run.sh b/tools/travis/run.sh index 90e7d5708..a531cbb56 100755 --- a/tools/travis/run.sh +++ b/tools/travis/run.sh @@ -55,6 +55,10 @@ elif [[ "$GROUP" == "2" ]]; then # Separate Job for running integration tests for 'pip install' tox -- -m integration -n auto --duration=5 -k "test_install" \ --use-venv $RESOLVER_SWITCH +elif [[ "$GROUP" == "3" ]]; then + # Separate Job for tests that fail with the new resolver + tox -- -m fails_on_new_resolver -n auto --duration=5 \ + --use-venv $RESOLVER_SWITCH --new-resolver-runtests else # Non-Testing Jobs should run once tox diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index d4676e2fb..c52ce5f16 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -2,5 +2,5 @@ set -e echo "Setting Git Credentials..." -git config --global user.email "pypa-dev@googlegroups.com" +git config --global user.email "distutils-sig@python.org" git config --global user.name "pip" |