Browse Source

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

Dan Helfman 6 years ago
parent
commit
06261d8c86
3 changed files with 8 additions and 3 deletions
  1. 1 1
      .drone.yml
  2. 6 0
      scripts/pip
  3. 1 2
      tox.ini

+ 1 - 1
.drone.yml

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

+ 6 - 0
scripts/pip

@@ -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 $*
+

+ 1 - 2
tox.ini

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