Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: drop support for Python 3.10 and Django 3.2 #292

Merged
merged 4 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: ["3.8", "3.10", "3.11"]
django: ["32", "42"]
python-version: ["3.8", "3.11"]
django: ["42"]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
35 changes: 16 additions & 19 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# django
# djangorestframework
# kombu
billiard==4.2.0
billiard==4.2.1
# via celery
celery==5.4.0
# via
Expand All @@ -31,7 +31,7 @@ cffi==1.17.1
# via
# cryptography
# pynacl
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
click==8.1.7
# via
Expand All @@ -50,7 +50,7 @@ click-repl==0.3.0
# via celery
code-annotations==1.8.0
# via edx-toggles
cryptography==43.0.1
cryptography==43.0.3
# via
# jwcrypto
# pyjwt
Expand Down Expand Up @@ -85,10 +85,8 @@ django-crum==0.7.9
# edx-django-utils
# edx-proctoring
# edx-toggles
django-filter==23.5
# via
# -c requirements/constraints.txt
# -r requirements/base.in
django-filter==24.3
# via -r requirements/base.in
django-ipware==7.0.1
# via edx-proctoring
django-model-utils==5.0.0
Expand All @@ -114,9 +112,8 @@ django-waffle==4.1.0
# edx-toggles
django-webpack-loader==3.1.1
# via edx-proctoring
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -c requirements/constraints.txt
# -r requirements/base.in
# drf-jwt
# drf-yasg
Expand All @@ -125,13 +122,13 @@ djangorestframework==3.15.1
# edx-proctoring
drf-jwt==1.19.2
# via edx-drf-extensions
drf-yasg==1.21.7
drf-yasg==1.21.8
# via edx-api-doc-tools
edx-api-doc-tools==2.0.0
# via -r requirements/base.in
edx-ccx-keys==1.3.0
# via openedx-events
edx-django-utils==5.15.0
edx-django-utils==7.0.0
# via
# edx-drf-extensions
# edx-rest-api-client
Expand All @@ -152,7 +149,7 @@ edx-opaque-keys[django]==2.11.0
# edx-proctoring
# edx-when
# openedx-events
edx-proctoring==4.18.1
edx-proctoring==4.18.2
# via -r requirements/base.in
edx-rest-api-client==6.0.0
# via edx-proctoring
Expand All @@ -178,18 +175,18 @@ jsonfield==3.1.0
# via edx-proctoring
jwcrypto==1.5.6
# via django-oauth-toolkit
kombu==5.4.1
kombu==5.4.2
# via celery
lxml==5.3.0
# via xblock
mako==1.3.5
mako==1.3.6
# via xblock
markupsafe==2.1.5
# via
# jinja2
# mako
# xblock
newrelic==9.13.0
newrelic==10.2.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -204,13 +201,13 @@ packaging==24.1
# via drf-yasg
pbr==6.1.0
# via stevedore
prompt-toolkit==3.0.47
prompt-toolkit==3.0.48
# via click-repl
psutil==6.0.0
psutil==6.1.0
# via edx-django-utils
pycparser==2.22
# via cffi
pycryptodomex==3.20.0
pycryptodomex==3.21.0
# via edx-proctoring
pyjwt[crypto]==2.9.0
# via
Expand Down Expand Up @@ -288,7 +285,7 @@ typing-extensions==4.12.2
# edx-opaque-keys
# jwcrypto
# kombu
tzdata==2024.1
tzdata==2024.2
# via
# backports-zoneinfo
# celery
Expand Down
8 changes: 0 additions & 8 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,5 @@ pylint<3.0
pycodestyle<2.9.0
django-oauth-toolkit<2.0.0

# Adding pin to avoid any major upgrade.
# 3.15.1 is the latest version that works with Django 3.2
djangorestframework<3.15.2

# Adding pin to avoid any major upgrade.
# 23.5. is the latest version that works with Django 3.2
django-filter<24.1

# backports.zoneinfo is only needed for Python < 3.9
backports.zoneinfo; python_version<'3.9'
1 change: 0 additions & 1 deletion requirements/django32.txt

This file was deleted.

6 changes: 3 additions & 3 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
build==1.2.2
build==1.2.2.post1
# via pip-tools
click==8.1.7
# via pip-tools
Expand All @@ -14,11 +14,11 @@ packaging==24.1
# via build
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.1.0
pyproject-hooks==1.2.0
# via
# build
# pip-tools
tomli==2.0.1
tomli==2.0.2
# via
# build
# pip-tools
Expand Down
42 changes: 20 additions & 22 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# django
# djangorestframework
# kombu
billiard==4.2.0
billiard==4.2.1
# via
# -r requirements/base.txt
# celery
Expand All @@ -48,7 +48,7 @@ cffi==1.17.1
# -r requirements/base.txt
# cryptography
# pynacl
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via
# -r requirements/base.txt
# requests
Expand Down Expand Up @@ -79,7 +79,7 @@ code-annotations==1.8.0
# edx-toggles
coverage==7.6.1
# via -r requirements/test.in
cryptography==43.0.1
cryptography==43.0.3
# via
# -r requirements/base.txt
# jwcrypto
Expand All @@ -92,7 +92,7 @@ defusedxml==0.8.0rc2
# -r requirements/base.txt
# python3-openid
# social-auth-core
dill==0.3.8
dill==0.3.9
# via pylint
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
Expand Down Expand Up @@ -122,10 +122,8 @@ django-crum==0.7.9
# edx-django-utils
# edx-proctoring
# edx-toggles
django-filter==23.5
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
django-filter==24.3
# via -r requirements/base.txt
django-ipware==7.0.1
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -157,9 +155,8 @@ django-webpack-loader==3.1.1
# via
# -r requirements/base.txt
# edx-proctoring
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# drf-jwt
# drf-yasg
Expand All @@ -170,7 +167,7 @@ drf-jwt==1.19.2
# via
# -r requirements/base.txt
# edx-drf-extensions
drf-yasg==1.21.7
drf-yasg==1.21.8
# via
# -r requirements/base.txt
# edx-api-doc-tools
Expand All @@ -180,7 +177,7 @@ edx-ccx-keys==1.3.0
# via
# -r requirements/base.txt
# openedx-events
edx-django-utils==5.15.0
edx-django-utils==7.0.0
# via
# -r requirements/base.txt
# edx-drf-extensions
Expand All @@ -202,7 +199,7 @@ edx-opaque-keys[django]==2.11.0
# edx-proctoring
# edx-when
# openedx-events
edx-proctoring==4.18.1
edx-proctoring==4.18.2
# via -r requirements/base.txt
edx-rest-api-client==6.0.0
# via
Expand All @@ -225,7 +222,7 @@ exceptiongroup==1.2.2
# via pytest
factory-boy==3.3.1
# via -r requirements/test.in
faker==28.4.1
faker==30.8.0
# via factory-boy
fastavro==1.9.7
# via
Expand Down Expand Up @@ -259,7 +256,7 @@ jwcrypto==1.5.6
# via
# -r requirements/base.txt
# django-oauth-toolkit
kombu==5.4.1
kombu==5.4.2
# via
# -r requirements/base.txt
# celery
Expand All @@ -269,7 +266,7 @@ lxml==5.3.0
# via
# -r requirements/base.txt
# xblock
mako==1.3.5
mako==1.3.6
# via
# -r requirements/base.txt
# xblock
Expand All @@ -283,7 +280,7 @@ mccabe==0.7.0
# via pylint
mock==5.1.0
# via -r requirements/test.in
newrelic==9.13.0
newrelic==10.2.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -310,11 +307,11 @@ platformdirs==4.3.6
# via pylint
pluggy==1.5.0
# via pytest
prompt-toolkit==3.0.47
prompt-toolkit==3.0.48
# via
# -r requirements/base.txt
# click-repl
psutil==6.0.0
psutil==6.1.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -326,7 +323,7 @@ pycparser==2.22
# via
# -r requirements/base.txt
# cffi
pycryptodomex==3.20.0
pycryptodomex==3.21.0
# via
# -r requirements/base.txt
# edx-proctoring
Expand Down Expand Up @@ -443,7 +440,7 @@ text-unidecode==1.3
# via
# -r requirements/base.txt
# python-slugify
tomli==2.0.1
tomli==2.0.2
# via
# pylint
# pytest
Expand All @@ -456,10 +453,11 @@ typing-extensions==4.12.2
# astroid
# django-countries
# edx-opaque-keys
# faker
# jwcrypto
# kombu
# pylint
tzdata==2024.1
tzdata==2024.2
# via
# -r requirements/base.txt
# backports-zoneinfo
Expand Down
12 changes: 7 additions & 5 deletions requirements/tox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
distlib==0.3.9
# via virtualenv
filelock==3.16.1
# via
Expand All @@ -26,13 +26,15 @@ platformdirs==4.3.6
# virtualenv
pluggy==1.5.0
# via tox
pyproject-api==1.7.1
pyproject-api==1.8.0
# via tox
tomli==2.0.1
tomli==2.0.2
# via
# pyproject-api
# tox
tox==4.19.0
tox==4.23.1
# via -r requirements/tox.in
virtualenv==20.26.4
typing-extensions==4.12.2
# via tox
virtualenv==20.27.0
# via tox
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
[tox]
envlist = py{38, 310, 311}-django{32, 42}
envlist = py{38, 311}-django{42}


[testenv]
passenv = TEST_INTEGRATION
envdir=
py38: {toxworkdir}/py38
py310: {toxworkdir}/py310
py311: {toxworkdir}/py311

deps =
django32: -r requirements/django32.txt
django42: -r requirements/django42.txt
-r requirements/test.txt
commands =
Expand Down
Loading