Skip to content

Commit b88db2e

Browse files
committed
travis: inject travis_retry_pip into tox.ini
1 parent c4b21f1 commit b88db2e

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,15 @@ matrix:
4545
- env: TESTENV=python3.4-master-sqlite
4646
- env: TESTENV=python3.4-master-sqlite_file
4747
install:
48-
# Create pip script, using travis_retry (a function).
49-
- _orig_pip="$(which pip)"
48+
# Create pip wrapper script, using travis_retry (a function) and
49+
# inject it into tox.ini.
5050
- mkdir -p bin
5151
- PATH=$PWD/bin:$PATH
52-
- printf '#!/bin/sh\n' > bin/pip
53-
- declare -f travis_retry >> bin/pip
54-
- printf '\necho "Using pip-wrapper.."\ntravis_retry %s "$@"' $_orig_pip >> bin/pip
55-
- chmod +x bin/pip
52+
- printf '#!/bin/sh\n' > bin/travis_retry_pip
53+
- declare -f travis_retry >> bin/travis_retry_pip
54+
- printf '\necho "Using pip-wrapper.." >&2\ntravis_retry pip "$@"' >> bin/travis_retry_pip
55+
- chmod +x bin/travis_retry_pip
56+
- sed -i 's/\[testenv\]/\0\ninstall_command = travis_retry_pip install {opts} {packages}/' tox.ini
57+
5658
- pip install tox
5759
script: tox -e $TESTENV

generate_configurations.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,16 @@ def make_travis_yml(envs):
226226
allow_failures:
227227
%(allow_failures)s
228228
install:
229-
# Create pip script, using travis_retry (a function).
230-
- _orig_pip="$(which pip)"
229+
# Create pip wrapper script, using travis_retry (a function) and
230+
# inject it into tox.ini.
231231
- mkdir -p bin
232232
- PATH=$PWD/bin:$PATH
233-
- printf '#!/bin/sh\\n' > bin/pip
234-
- declare -f travis_retry >> bin/pip
235-
- printf '\\necho "Using pip-wrapper.."\\ntravis_retry %%s "$@"' $_orig_pip >> bin/pip
236-
- chmod +x bin/pip
233+
- printf '#!/bin/sh\\n' > bin/travis_retry_pip
234+
- declare -f travis_retry >> bin/travis_retry_pip
235+
- printf '\\necho "Using pip-wrapper.." >&2\\ntravis_retry pip "$@"' >> bin/travis_retry_pip
236+
- chmod +x bin/travis_retry_pip
237+
- sed -i 's/\[testenv\]/\\0\\ninstall_command = travis_retry_pip install {opts} {packages}/' tox.ini
238+
237239
- pip install tox
238240
script: tox -e $TESTENV
239241
""").strip("\n")

0 commit comments

Comments
 (0)