Skip to content

Commit 4bf4093

Browse files
authored
reqs: testing: unpin django-configurations/pytest-xdist (#645)
* reqs: testing: unpin django-configurations/pytest-xdist * Travis: upgrade tox to 3.3.0 * Travis: tox: remove travis_retry_pip install wrapper
1 parent b7c7c1c commit 4bf4093

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

.travis.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,7 @@ stages:
7272
if: tag IS present
7373

7474
install:
75-
# Create pip wrapper script, using travis_retry (a function) and
76-
# inject it into tox.ini.
77-
- mkdir -p bin
78-
- PATH=$PWD/bin:$PATH
79-
- printf '#!/bin/sh\n' > bin/travis_retry_pip
80-
- declare -f travis_retry >> bin/travis_retry_pip
81-
- printf '\necho "Using pip-wrapper.." >&2\ntravis_retry pip "$@"' >> bin/travis_retry_pip
82-
- chmod +x bin/travis_retry_pip
83-
- sed -i.bak 's/^\[testenv\]/\0\nwhitelist_externals = travis_retry_pip\ninstall_command = travis_retry_pip install {opts} {packages}/' tox.ini
84-
- if diff tox.ini tox.ini.bak; then exit 1; fi
85-
86-
- pip install tox==2.9.1
75+
- pip install tox==3.3.0
8776
- |
8877
# Setup coverage tracking.
8978
if [[ "$SKIP_COVERAGE" != "1" ]]; then

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ def read(fname):
4242
'testing': [
4343
'pytest>=3.6',
4444
'Django',
45-
'django-configurations==2.0',
46-
'pytest-xdist==1.15',
45+
'django-configurations>=2.0',
46+
'pytest-xdist>=1.15',
4747
'six',
4848
],
4949
},

0 commit comments

Comments
 (0)