From 4cf4c795da4a2cfadc3c46673fe082daf4b598f5 Mon Sep 17 00:00:00 2001 From: "Adolfo R. Brandes" Date: Fri, 14 Jun 2024 17:00:39 -0300 Subject: [PATCH 1/4] build: Update codecov and use token Update codecov to the latest version and start using the org-wide token for uploads. See https://github.com/openedx/wg-frontend/issues/179 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cde90cb0..ed5a1207 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,8 @@ jobs: - name: Run coverage if: matrix.python-version == '3.8' && matrix.toxenv == 'django42-celery53-drflatest' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: + token: ${{ secrets.CODECOV_TOKEN }} flags: unittests - fail_ci_if_error: false - + fail_ci_if_error: true From cdb7990fef95acc7a83a69da477832f7a1c818a4 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 21 Jun 2024 20:26:26 -0400 Subject: [PATCH 2/4] build: Don't run the tests twice for no reason. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed5a1207..64c5a7cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - '3.8' - '3.11' - '3.12' - toxenv: [django42-celery53-drflatest, django42-celery53-drflatest, + toxenv: [django42-celery53-drflatest, quality, docs, django42] steps: From e0895af878181ecf8dd57a021c6358aeb73ddc15 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Sat, 22 Jun 2024 13:51:36 -0400 Subject: [PATCH 3/4] build: Add coverage so we collect coverage info in CI. --- requirements/ci.in | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/ci.in b/requirements/ci.in index cac9426f..cb39bc39 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -2,3 +2,4 @@ -c constraints.txt tox # Virtualenv management for tests +coverage # to capture code coverage information From 678f1cebdf1ba1039ed48045968723f5562cc2f0 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Sat, 22 Jun 2024 13:52:00 -0400 Subject: [PATCH 4/4] chore: Run `make upgrade` --- requirements/base.txt | 2 +- requirements/ci.txt | 8 +++++--- requirements/dev.txt | 9 +++++---- requirements/doc.txt | 4 ++-- requirements/pip.txt | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 406706cd..20805513 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -42,7 +42,7 @@ django==4.2.13 # drf-yasg django-model-utils==4.5.1 # via -r requirements/base.in -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via # -r requirements/base.in # drf-yasg diff --git a/requirements/ci.txt b/requirements/ci.txt index 697608e1..1587dc7a 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,9 +10,11 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox +coverage==7.5.3 + # via -r requirements/ci.in distlib==0.3.8 # via virtualenv -filelock==3.15.1 +filelock==3.15.4 # via # tox # virtualenv @@ -26,7 +28,7 @@ platformdirs==4.2.2 # virtualenv pluggy==1.5.0 # via tox -pyproject-api==1.6.1 +pyproject-api==1.7.1 # via tox tomli==2.0.1 # via @@ -34,5 +36,5 @@ tomli==2.0.1 # tox tox==4.15.1 # via -r requirements/ci.in -virtualenv==20.26.2 +virtualenv==20.26.3 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 8a9c6273..7abcf6ab 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -84,6 +84,7 @@ colorama==0.4.6 # tox coverage[toml]==7.5.3 # via + # -r requirements/ci.txt # -r requirements/test.txt # pytest-cov dill==0.3.8 @@ -104,7 +105,7 @@ django==4.2.13 # edx-i18n-tools django-model-utils==4.5.1 # via -r requirements/test.txt -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via # -r requirements/test.txt # drf-yasg @@ -120,7 +121,7 @@ exceptiongroup==1.2.1 # via # -r requirements/test.txt # pytest -filelock==3.15.1 +filelock==3.15.4 # via # -r requirements/ci.txt # tox @@ -227,7 +228,7 @@ pylint-plugin-utils==0.8.2 # -r requirements/quality.txt # pylint-celery # pylint-django -pyproject-api==1.6.1 +pyproject-api==1.7.1 # via # -r requirements/ci.txt # tox @@ -332,7 +333,7 @@ vine==5.1.0 # amqp # celery # kombu -virtualenv==20.26.2 +virtualenv==20.26.3 # via # -r requirements/ci.txt # tox diff --git a/requirements/doc.txt b/requirements/doc.txt index 877f3a92..55346d0f 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -90,7 +90,7 @@ django-model-utils==4.5.1 # via -r requirements/base.txt django-rest-swagger==2.2.0 # via -r requirements/doc.in -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via # -r requirements/base.txt # django-rest-swagger @@ -307,7 +307,7 @@ uritemplate==4.1.1 # -r requirements/base.txt # coreapi # drf-yasg -urllib3==2.2.1 +urllib3==2.2.2 # via # requests # twine diff --git a/requirements/pip.txt b/requirements/pip.txt index 8a72bb0b..c9a36e3e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.0 +pip==24.1 # via -r requirements/pip.in -setuptools==70.0.0 +setuptools==70.1.0 # via -r requirements/pip.in