From c296a9431e6964c5729e9623869a1c864a51fa63 Mon Sep 17 00:00:00 2001
From: Bert Blommers <bblommers@users.noreply.github.com>
Date: Wed, 18 Aug 2021 09:19:27 +0100
Subject: [PATCH] Resolve coverage dependency conflict (#4191)

---
 .github/workflows/build.yml | 12 +++++++-----
 requirements-dev.txt        |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba0f12857..0e0f4748e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Update pip
         if: ${{ steps.pip-cache.outputs.cache-hit != 'true' }}
         run: |
-          python -m pip install pip==21.1.3
+          python -m pip install --upgrade pip
       - name: Install project dependencies
         if: ${{ steps.pip-cache.outputs.cache-hit != 'true' }}
         run: |
@@ -96,8 +96,7 @@ jobs:
     # Update PIP
     - name: Update pip
       run: |
-        # https://github.com/pypa/pip/issues/10201
-        python -m pip install pip==21.1.3
+        python -m pip install --upgrade pip
     # Still need to properly install the dependencies - it will only skip the download part
     - name: Install project dependencies
       run: |
@@ -134,12 +133,14 @@ jobs:
         key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4
     - name: Update pip
       run: |
-        python -m pip install pip==21.1.3
+        python -m pip install --upgrade pip
     - name: Install project dependencies
       run: |
         pip install -r requirements-dev.txt
         pip install pytest-cov
         pip install pytest-github-actions-annotate-failures
+        # https://github.com/aws/aws-xray-sdk-python/issues/196
+        pip install "coverage<=4.5.4"
     - name: Test with pytest
       run: |
         make test-coverage
@@ -182,10 +183,11 @@ jobs:
         key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4
     - name: Update pip
       run: |
-        python -m pip install pip==21.1.3
+        python -m pip install --upgrade pip
     - name: Install project dependencies
       run: |
         pip install -r requirements-dev.txt
+        pip install "coverage<=4.5.4"
     - name: Test ServerMode/Coverage
       env:
         TEST_SERVER_MODE: ${{ true }}
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 79173ae9a..171617185 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,7 +3,6 @@
 
 black==19.10b0
 regex==2019.11.1
-coverage==4.5.4
 flake8==3.7.8
 boto>=2.45.0
 click