Skip to content

Commit

Permalink
chore: Upgrade Python requirements (#201)
Browse files Browse the repository at this point in the history
* 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 <mroytman@edx.org>
  • Loading branch information
edx-requirements-bot and MichaelRoytman committed Jun 27, 2024
1 parent 1b7f4ad commit eb0e57a
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,13 +28,13 @@ 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
# pyproject-api
# tox
tox==4.15.1
# via -r requirements/ci.in
virtualenv==20.26.2
virtualenv==20.26.3
# via tox
8 changes: 4 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit eb0e57a

Please sign in to comment.