From 17ee2fbb353baf44cfb088e1c8a0bd5657a4a660 Mon Sep 17 00:00:00 2001
From: Tim McCormack <tmccormack@edx.org>
Date: Thu, 13 Apr 2023 17:22:24 +0000
Subject: [PATCH 1/2] fix: Remove yanked codecov package

I guess this repo isn't using the newer github action, but adding that can
be a different task if we decide to continue with codecov.
---
 requirements/ci.in   |  1 -
 requirements/ci.txt  | 14 --------------
 requirements/dev.txt | 13 +------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/requirements/ci.in b/requirements/ci.in
index dab2dca8..04975275 100644
--- a/requirements/ci.in
+++ b/requirements/ci.in
@@ -1,6 +1,5 @@
 # Requirements for running tests in Github CI
 -c constraints.txt
 
-codecov                   # Code coverage reporting
 tox                       # Virtualenv management for tests
 tox-battery               # Makes tox aware of requirements file changes
diff --git a/requirements/ci.txt b/requirements/ci.txt
index c69f4c1a..a3483c39 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -4,22 +4,12 @@
 #
 #    make upgrade
 #
-certifi==2022.12.7
-    # via requests
-charset-normalizer==3.1.0
-    # via requests
-codecov==2.1.12
-    # via -r requirements/ci.in
-coverage==7.2.1
-    # via codecov
 distlib==0.3.6
     # via virtualenv
 filelock==3.9.1
     # via
     #   tox
     #   virtualenv
-idna==3.4
-    # via requests
 packaging==23.0
     # via tox
 platformdirs==3.1.1
@@ -28,8 +18,6 @@ pluggy==1.0.0
     # via tox
 py==1.11.0
     # via tox
-requests==2.28.2
-    # via codecov
 six==1.16.0
     # via tox
 tomli==2.0.1
@@ -41,7 +29,5 @@ tox==3.28.0
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/ci.in
-urllib3==1.26.15
-    # via requests
 virtualenv==20.21.0
     # via tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
index f53016db..0c36ba30 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -27,7 +27,6 @@ build==0.10.0
     #   pip-tools
 certifi==2022.12.7
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/test.txt
     #   requests
 cffi==1.15.1
@@ -36,7 +35,6 @@ cffi==1.15.1
     #   pynacl
 charset-normalizer==3.1.0
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/test.txt
     #   requests
 click==8.1.3
@@ -45,13 +43,9 @@ click==8.1.3
     #   -r requirements/test.txt
     #   edx-django-utils
     #   pip-tools
-codecov==2.1.12
-    # via -r requirements/ci.txt
 coverage[toml]==7.2.1
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/test.txt
-    #   codecov
     #   pytest-cov
 distlib==0.3.6
     # via
@@ -92,7 +86,6 @@ gunicorn==20.1.0
     # via -r requirements/test.txt
 idna==3.4
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/test.txt
     #   requests
 iniconfig==2.0.0
@@ -188,10 +181,7 @@ pyyaml==6.0
     #   -r requirements/test.txt
     #   edx-django-release-util
 requests==2.28.2
-    # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
-    #   codecov
+    # via -r requirements/test.txt
 s3transfer==0.6.0
     # via
     #   -r requirements/test.txt
@@ -231,7 +221,6 @@ tox-battery==0.6.1
     # via -r requirements/ci.txt
 urllib3==1.26.15
     # via
-    #   -r requirements/ci.txt
     #   -r requirements/test.txt
     #   botocore
     #   requests

From 0dd9f4266f23600b0d96a14578f029921cec05db Mon Sep 17 00:00:00 2001
From: Tim McCormack <tmccormack@edx.org>
Date: Thu, 13 Apr 2023 20:19:03 +0000
Subject: [PATCH 2/2] build: Remove the codecov call, which was used after all.

https://github.com/openedx/xqueue/issues/887 tracks restoring and fixing
coverage testing.
---
 .github/workflows/ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 286c66c5..59e21977 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,9 +29,3 @@ jobs:
       run: |
         docker exec xqueue bash -c "cd /edx/app/xqueue/xqueue/; pip3 install -r requirements/ci.txt"
         docker exec xqueue bash -c "cd /edx/app/xqueue/xqueue/ && DB_HOST=${{ matrix.db-version }} tox -e ${TOXENV}"
-
-    - name: Code Coverage
-      if: matrix.tox-env=='django32'
-      run: |
-        python3.8 -m pip install -r requirements/ci.txt &&
-        docker exec xqueue bash -c "cd /edx/app/xqueue/xqueue/; coverage xml" && codecov