Skip to content

Commit

Permalink
chore: Upgrade Python requirements (#93)
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.

* test: update Django 4.0 environment to 4.2

This commit updates the Django 4.0 environment in CI to 4.2. Django 4.2 is the current Django version on our platform. Django 4.0 was pulled in via the tox.ini template in the edx-cookiecutters repository.

A corresponding change to the edx-cookiecutters repository to update the template Django version from 4.0 to 4.2 will be requested.

---------

Co-authored-by: michaelroytman <mroytman@edx.org>
  • Loading branch information
edx-requirements-bot and MichaelRoytman authored Jun 27, 2024
1 parent 65b8968 commit e498795
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [quality, pii_check, django32, django40]
toxenv: [quality, pii_check, django42]

steps:
- uses: actions/checkout@v2
Expand All @@ -37,7 +37,7 @@ jobs:
run: tox

- name: Run coverage
if: matrix.python-version == '3.8' && matrix.toxenv == 'django32'
if: matrix.python-version == '3.8' && matrix.toxenv == 'django40'
uses: py-cov-action/python-coverage-comment-action@v3
with:
GITHUB_TOKEN: ${{ github.token }}
Expand Down
8 changes: 4 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ django-waffle==4.1.0
# via
# edx-django-utils
# edx-drf-extensions
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r requirements/base.in
# drf-jwt
Expand All @@ -62,7 +62,7 @@ edx-opaque-keys==2.10.0
# via
# -r requirements/base.in
# edx-drf-extensions
edx-rest-api-client==5.7.0
edx-rest-api-client==5.7.1
# via -r requirements/base.in
idna==3.7
# via requests
Expand All @@ -74,7 +74,7 @@ newrelic==9.11.0
# via edx-django-utils
pbr==6.0.0
# via stevedore
psutil==5.9.8
psutil==6.0.0
# via edx-django-utils
pycparser==2.22
# via cffi
Expand All @@ -87,7 +87,7 @@ pymongo==4.7.3
# via edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
requests==2.31.0
requests==2.32.3
# via
# edx-drf-extensions
# edx-rest-api-client
Expand Down
6 changes: 3 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.15.1
filelock==3.15.4
# via
# tox
# virtualenv
Expand All @@ -26,13 +26,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
16 changes: 8 additions & 8 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.5.3
coverage[toml]==7.5.4
# via
# -r requirements/quality.txt
# pytest-cov
Expand Down Expand Up @@ -110,7 +110,7 @@ django-waffle==4.1.0
# -r requirements/quality.txt
# edx-django-utils
# edx-drf-extensions
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r requirements/quality.txt
# drf-jwt
Expand Down Expand Up @@ -138,13 +138,13 @@ edx-opaque-keys==2.10.0
# via
# -r requirements/quality.txt
# edx-drf-extensions
edx-rest-api-client==5.7.0
edx-rest-api-client==5.7.1
# via -r requirements/quality.txt
exceptiongroup==1.2.1
# via
# -r requirements/quality.txt
# pytest
filelock==3.15.1
filelock==3.15.4
# via
# -r requirements/ci.txt
# tox
Expand Down Expand Up @@ -222,7 +222,7 @@ pluggy==1.5.0
# tox
polib==1.2.0
# via edx-i18n-tools
psutil==5.9.8
psutil==6.0.0
# via
# -r requirements/quality.txt
# edx-django-utils
Expand Down Expand Up @@ -270,7 +270,7 @@ pynacl==1.5.0
# via
# -r requirements/quality.txt
# edx-django-utils
pyproject-api==1.6.1
pyproject-api==1.7.1
# via
# -r requirements/ci.txt
# tox
Expand Down Expand Up @@ -298,7 +298,7 @@ pyyaml==6.0.1
# code-annotations
# edx-i18n-tools
# responses
requests==2.31.0
requests==2.32.3
# via
# -r requirements/quality.txt
# edx-drf-extensions
Expand Down Expand Up @@ -367,7 +367,7 @@ urllib3==2.2.2
# -r requirements/quality.txt
# requests
# responses
virtualenv==20.26.2
virtualenv==20.26.3
# via
# -r requirements/ci.txt
# tox
Expand Down
10 changes: 5 additions & 5 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ click==8.1.7
# edx-django-utils
code-annotations==1.8.0
# via -r requirements/test.txt
coverage[toml]==7.5.3
coverage[toml]==7.5.4
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -76,7 +76,7 @@ django-waffle==4.1.0
# -r requirements/test.txt
# edx-django-utils
# edx-drf-extensions
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r requirements/test.txt
# drf-jwt
Expand Down Expand Up @@ -108,7 +108,7 @@ edx-opaque-keys==2.10.0
# via
# -r requirements/test.txt
# edx-drf-extensions
edx-rest-api-client==5.7.0
edx-rest-api-client==5.7.1
# via -r requirements/test.txt
exceptiongroup==1.2.1
# via
Expand Down Expand Up @@ -184,7 +184,7 @@ pluggy==1.5.0
# via
# -r requirements/test.txt
# pytest
psutil==5.9.8
psutil==6.0.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -236,7 +236,7 @@ pyyaml==6.0.1
# responses
readme-renderer==43.0
# via twine
requests==2.31.0
requests==2.32.3
# via
# -r requirements/test.txt
# edx-drf-extensions
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
# via -r requirements/pip.in
10 changes: 5 additions & 5 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ code-annotations==1.8.0
# via
# -r requirements/test.txt
# edx-lint
coverage[toml]==7.5.3
coverage[toml]==7.5.4
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -79,7 +79,7 @@ django-waffle==4.1.0
# -r requirements/test.txt
# edx-django-utils
# edx-drf-extensions
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r requirements/test.txt
# drf-jwt
Expand All @@ -105,7 +105,7 @@ edx-opaque-keys==2.10.0
# via
# -r requirements/test.txt
# edx-drf-extensions
edx-rest-api-client==5.7.0
edx-rest-api-client==5.7.1
# via -r requirements/test.txt
exceptiongroup==1.2.1
# via
Expand Down Expand Up @@ -151,7 +151,7 @@ pluggy==1.5.0
# via
# -r requirements/test.txt
# pytest
psutil==5.9.8
psutil==6.0.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -209,7 +209,7 @@ pyyaml==6.0.1
# -r requirements/test.txt
# code-annotations
# responses
requests==2.31.0
requests==2.32.3
# via
# -r requirements/test.txt
# edx-drf-extensions
Expand Down
10 changes: 5 additions & 5 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ click==8.1.7
# edx-django-utils
code-annotations==1.8.0
# via -r requirements/test.in
coverage[toml]==7.5.3
coverage[toml]==7.5.4
# via pytest-cov
cryptography==42.0.8
# via
Expand Down Expand Up @@ -64,7 +64,7 @@ django-waffle==4.1.0
# -r requirements/base.txt
# edx-django-utils
# edx-drf-extensions
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r requirements/base.txt
# drf-jwt
Expand All @@ -88,7 +88,7 @@ edx-opaque-keys==2.10.0
# via
# -r requirements/base.txt
# edx-drf-extensions
edx-rest-api-client==5.7.0
edx-rest-api-client==5.7.1
# via -r requirements/base.txt
exceptiongroup==1.2.1
# via pytest
Expand Down Expand Up @@ -118,7 +118,7 @@ pbr==6.0.0
# stevedore
pluggy==1.5.0
# via pytest
psutil==5.9.8
psutil==6.0.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand Down Expand Up @@ -154,7 +154,7 @@ pyyaml==6.0.1
# via
# code-annotations
# responses
requests==2.31.0
requests==2.32.3
# via
# -r requirements/base.txt
# edx-drf-extensions
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{32,40}
envlist = py38-django{42}

[doc8]
; D001 = Line too long
Expand Down Expand Up @@ -36,8 +36,7 @@ norecursedirs = .* docs requirements site-packages

[testenv]
deps =
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
commands =
python manage.py check
Expand Down

0 comments on commit e498795

Please sign in to comment.