Merge branch 'master' into tox-skip-missing-interpreters

This commit is contained in:
Dan Helfman 2019-05-14 12:18:30 -07:00
commit 06261d8c86
3 changed files with 8 additions and 3 deletions

View File

@ -3,7 +3,7 @@ pipeline:
image: python:${PYTHON_VERSION}-alpine${ALPINE_VERSION} image: python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
pull: true pull: true
commands: commands:
- pip install --upgrade pip==19.1.1 - python -m pip install --upgrade pip==19.1.1
- pip install tox==3.10.0 - pip install tox==3.10.0
- tox - tox
- apk add --no-cache borgbackup - apk add --no-cache borgbackup

6
scripts/pip Executable file
View File

@ -0,0 +1,6 @@
#!/usr/bin/env sh
# Temporary work around for https://github.com/pypa/pip/issues/6434
python -m pip install --upgrade pip==19.1.1
python -m pip install --no-use-pep517 $*

View File

@ -9,8 +9,7 @@ usedevelop = True
deps = -rtest_requirements.txt deps = -rtest_requirements.txt
whitelist_externals = sh whitelist_externals = sh
install_command = install_command =
# temporary work around for https://github.com/pypa/pip/issues/6434 sh scripts/pip {opts} {packages}
python -m pip install --no-use-pep517 {opts} {packages}
commands = commands =
pytest pytest
py36,py37: black --check . py36,py37: black --check .