From 5787e8f4a06911c1b55d79dfea03085532d39e05 Mon Sep 17 00:00:00 2001
From: Selwin Ong <selwin.ong@gmail.com>
Date: Wed, 3 May 2023 05:46:10 +0700
Subject: [PATCH] Coverage fixes (#1890)

* Don't fail CI if codecov fails

* Remove codecov from dev-requirements.txt

* Pin packaging dependency to 21.3

* Pin coverage to 6.5.0

* Pin coverage to 6.2

* Downgrade packaging

* Drop Python 3.6 from test matrix

* Reenable Python 3.6 in tests

* Downgrade coverage req

* Make a different dev-requirements file for Python 3.6

* Moved dev-requirements-36 to root dir
---
 .github/workflows/workflow.yml | 45 +++++++++++++++++++++++++++++++---
 dev-requirements-36.txt        |  8 ++++++
 dev-requirements.txt           |  3 ++-
 3 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 dev-requirements-36.txt

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index f4371a2..4482102 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -1,4 +1,4 @@
-name: Test rq
+name: Test
 
 on:
   push:
@@ -10,13 +10,13 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  build:
+  test:
     name: Python${{ matrix.python-version }}/Redis${{ matrix.redis-version }}/redis-py${{ matrix.redis-py-version }}
     runs-on: ubuntu-20.04
     timeout-minutes: 10
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8.3", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8.3", "3.9", "3.10", "3.11"]
         redis-version: [3, 4, 5, 6, 7]
         redis-py-version: [3.5.0]
 
@@ -49,3 +49,42 @@ jobs:
       with:
         file: ./coverage.xml
         fail_ci_if_error: false
+  test-python-36:
+    name: Python${{ matrix.python-version }}/Redis${{ matrix.redis-version }}/redis-py${{ matrix.redis-py-version }}
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    strategy:
+      matrix:
+        python-version: ["3.6"]
+        redis-version: [3, 4, 5, 6, 7]
+        redis-py-version: [3.5.0]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4.6.0
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Start Redis
+      uses: supercharge/redis-github-action@1.5.0
+      with:
+        redis-version: ${{ matrix.redis-version }}
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install redis==${{ matrix.redis-py-version }}
+        pip install -r requirements.txt -r dev-requirements-36.txt
+        pip install -e .
+
+    - name: Test with pytest
+      run: |
+        RUN_SLOW_TESTS_TOO=1 pytest --cov=./ --cov-report=xml --durations=5
+
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3
+      with:
+        file: ./coverage.xml
+        fail_ci_if_error: false
diff --git a/dev-requirements-36.txt b/dev-requirements-36.txt
new file mode 100644
index 0000000..dd8a4f1
--- /dev/null
+++ b/dev-requirements-36.txt
@@ -0,0 +1,8 @@
+packaging==21.3
+coverage==6.2
+psutil
+pytest
+pytest-cov
+sentry-sdk
+redis
+click
\ No newline at end of file
diff --git a/dev-requirements.txt b/dev-requirements.txt
index d16aa41..6eba5b9 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,4 +1,5 @@
-codecov
+packaging
+coverage
 psutil
 pytest
 pytest-cov