From eb0e57a7888118e43fb87bd7d2b5214342533761 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Thu, 27 Jun 2024 09:58:05 -0400 Subject: [PATCH] chore: Upgrade Python requirements (#201) * chore: Upgrade Python requirements * test: remove Django 3.2 environment from tox test environment Extended support for Django 3.2 ended on 04/01/2024. Dependencies of this library are beginning to require Django >= 4.2, which causes version incompatibilities when running tests in CI in the Django 3.2 environment. This commit removes the Django 3.2 environment from tox. --------- Co-authored-by: michaelroytman --- .github/workflows/ci.yml | 4 ++-- requirements/base.txt | 4 ++-- requirements/ci.txt | 8 ++++---- requirements/dev.txt | 8 ++++---- requirements/doc.txt | 4 ++-- requirements/test.txt | 6 +++--- tox.ini | 3 +-- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a813bcb..a591a7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: os: [ubuntu-20.04] python-version: ["3.8"] node-version: ["10"] - toxenv: [django32, django42, quality, pii_check, rst_validation] + toxenv: [django42, quality, pii_check, rst_validation] steps: - uses: actions/checkout@v1 @@ -36,7 +36,7 @@ jobs: run: tox - name: Run Coverage - if: matrix.toxenv == 'django32' + if: matrix.toxenv == 'django42' uses: py-cov-action/python-coverage-comment-action@v3 with: GITHUB_TOKEN: ${{ github.token }} diff --git a/requirements/base.txt b/requirements/base.txt index 7e70bc2..25cdf2d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -82,7 +82,7 @@ django-waffle==4.1.0 # edx-django-utils # edx-drf-extensions # edx-toggles -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via # -r requirements/base.in # django-config-models @@ -132,7 +132,7 @@ pbr==6.0.0 # via stevedore prompt-toolkit==3.0.47 # via click-repl -psutil==5.9.8 +psutil==6.0.0 # via edx-django-utils pycparser==2.22 # via cffi diff --git a/requirements/ci.txt b/requirements/ci.txt index 354a059..0a69fbd 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,11 +10,11 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -coverage==7.5.3 +coverage==7.5.4 # via -r requirements/ci.in distlib==0.3.8 # via virtualenv -filelock==3.15.1 +filelock==3.15.4 # via # tox # virtualenv @@ -28,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 @@ -36,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 4d2a160..c4abdbc 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -71,7 +71,7 @@ colorama==0.4.6 # via # -r requirements/ci.txt # tox -coverage==7.5.3 +coverage==7.5.4 # via -r requirements/ci.txt cryptography==42.0.8 # via @@ -101,7 +101,7 @@ edx-i18n-tools==1.6.0 # via -r requirements/dev.in edx-lint==5.3.6 # via -r requirements/quality.txt -filelock==3.15.1 +filelock==3.15.4 # via # -r requirements/ci.txt # tox @@ -260,7 +260,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 @@ -374,7 +374,7 @@ urllib3==2.2.2 # -r requirements/quality.txt # requests # twine -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 b6e159c..4ce4170 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -86,7 +86,7 @@ django-waffle==4.1.0 # edx-django-utils # edx-drf-extensions # edx-toggles -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via # -r requirements/base.in # django-config-models @@ -160,7 +160,7 @@ pockets==0.9.1 # via sphinxcontrib-napoleon prompt-toolkit==3.0.47 # via click-repl -psutil==5.9.8 +psutil==6.0.0 # via edx-django-utils pycparser==2.22 # via cffi diff --git a/requirements/test.txt b/requirements/test.txt index 29d4ab3..73cf7d2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -64,7 +64,7 @@ code-annotations==1.8.0 # -r requirements/base.txt # -r requirements/test.in # edx-toggles -coverage[toml]==7.5.3 +coverage[toml]==7.5.4 # via pytest-cov cryptography==42.0.8 # via @@ -109,7 +109,7 @@ django-waffle==4.1.0 # edx-django-utils # edx-drf-extensions # edx-toggles -djangorestframework==3.15.1 +djangorestframework==3.15.2 # via # -r requirements/base.txt # django-config-models @@ -195,7 +195,7 @@ prompt-toolkit==3.0.47 # via # -r requirements/base.txt # click-repl -psutil==5.9.8 +psutil==6.0.0 # via # -r requirements/base.txt # edx-django-utils diff --git a/tox.ini b/tox.ini index 2b471a9..4783b49 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-django{32,42}-celery{53}, quality, rst_validation, docs, pii_check +envlist = py38-django{42}-celery{53}, quality, rst_validation, docs, pii_check [doc8] ignore = D001 @@ -35,7 +35,6 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = - django32: Django>=3.2,<4.0 django42: Django>=4.2,<5.0 -r{toxinidir}/requirements/test.txt celery44: -r{toxinidir}/requirements/celery44.txt