From ba03d610058636a7c2f7980d3358089eb5e6f933 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 21 Jan 2020 18:47:45 +0100
Subject: [PATCH] ci: use installed pip, upgrade to pinned if necessary

Ref: https://github.com/pytest-dev/pytest/pull/6522
---
 .github/workflows/main.yml | 5 ++++-
 .travis.yml                | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e7c08097977..29a63e6b4c9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -120,7 +120,9 @@ jobs:
         key: pre-commit|${{ env.PY_CACHE_KEY }}|${{ hashFiles('.pre-commit-config.yaml') }}
 
     - name: Install tox
-      run: python -m pip install git+https://github.com/blueyed/tox@master
+      run: |
+        python -m pip --version
+        python -m pip install git+https://github.com/blueyed/tox@master
 
     - name: Setup tox environment
       run: python -m tox --notest -v --durations -e ${{ matrix.tox_env }}
@@ -157,6 +159,7 @@ jobs:
         python-version: "3.7"
     - name: Install dependencies
       run: |
+        python -m pip --version
         python -m pip install wheel setuptools git+https://github.com/blueyed/tox@master
     - name: Build package
       run: |
diff --git a/.travis.yml b/.travis.yml
index d74c0083ef6..6a87408f2c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ jobs:
       python: '3.5.1'
       dist: trusty
       before_install:
-        - python -m pip install -U pip
+        - python -m pip install -U pip==19.3.1
 
 before_script:
   - |