From ed2c6053deea6993ca4a95f3581d68e7cb7fb141 Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Tue, 14 May 2019 10:28:04 -0700
Subject: [PATCH] Upgrade pip to a particular version during local test and CI.

---
 .drone.yml  | 3 +--
 NEWS        | 2 +-
 scripts/pip | 6 ++++++
 tox.ini     | 3 +--
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100755 scripts/pip

diff --git a/.drone.yml b/.drone.yml
index c236e1c67..f533b7dd4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,8 +3,7 @@ pipeline:
     image: python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
     pull: true
     commands:
-      - pip install --upgrade pip==19.1.1
-      - pip install tox==3.10.0
+      - scripts/pip install tox==3.10.0
       - tox
       - apk add --no-cache borgbackup
       - tox -e end-to-end
diff --git a/NEWS b/NEWS
index 9fcedf0c2..fedd60156 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,10 @@
 1.3.4.dev0
  * Part of #125: Color borgmatic (but not Borg) output when using an interactive terminal.
  * #168: Update README with continuous integration badge.
+ * #169: Automatically sort Python imports in code.
  * Document installing borgmatic with pip install --user instead of a system Python install.
  * Get more reproducible builds by pinning the versions of pip and tox used to run tests.
  * Factor out build/test configuration from tox.ini file.
- * Automatically sort Python imports in code.
 
 1.3.3
  * Add validate-borgmatic-config command, useful for validating borgmatic config generated by
diff --git a/scripts/pip b/scripts/pip
new file mode 100755
index 000000000..21cd953e0
--- /dev/null
+++ b/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 $*
+
diff --git a/tox.ini b/tox.ini
index 626eee044..82b4c36d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,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
     sh scripts/black