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

Adding python3.12 support. #302

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8"]
python-version: ["3.8", "3.12"]
toxenv: [django42, quality, pii_check, check_keywords]
steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Expand Up @@ -99,12 +99,12 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with t
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade -o requirements/production.txt requirements/production.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/base.txt requirements/base.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/test.txt requirements/test.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/doc.txt requirements/doc.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/production.txt requirements/production.in
# Let tox control the Django version for tests
grep -e "^django==" requirements/production.txt > requirements/django.txt
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Expand Up @@ -26,3 +26,4 @@ mock
inflect
social-auth-core
boto3
setuptools
17 changes: 11 additions & 6 deletions requirements/base.txt
Expand Up @@ -10,15 +10,16 @@ asgiref==3.8.1
# via
# django
# django-cors-headers
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
# djangorestframework
beautifulsoup4==4.12.3
# via wagtail
boto3==1.34.75
boto3==1.34.79
# via -r requirements/base.in
botocore==1.34.75
botocore==1.34.79
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -106,7 +107,7 @@ drf-yasg==1.21.7
# via
# -r requirements/base.in
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
edx-api-doc-tools==1.8.0
# via -r requirements/base.in
edx-auth-backends==4.3.0
# via -r requirements/base.in
Expand Down Expand Up @@ -248,7 +249,7 @@ telepath==0.3.1
# via wagtail
typeguard==4.2.1
# via inflect
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# asgiref
# edx-opaque-keys
Expand All @@ -260,7 +261,7 @@ urllib3==1.26.18
# via
# botocore
# requests
wagtail==6.0.1
wagtail==6.0.2
# via -r requirements/base.in
webencodings==0.5.1
# via html5lib
Expand All @@ -272,3 +273,7 @@ zipp==3.18.1
# via
# -r requirements/base.in
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.2.0
# via -r requirements/base.in
4 changes: 4 additions & 0 deletions requirements/constraints.txt
Expand Up @@ -17,3 +17,7 @@ edx_rest_api_client==4.0.1 # versions>4.0.1 have backward incompatible chan

# Django5 release is inline. So better to add constraint.
Django<4.3


# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
25 changes: 15 additions & 10 deletions requirements/dev.txt
Expand Up @@ -18,18 +18,19 @@ astroid==3.1.0
# -r requirements/quality.txt
# pylint
# pylint-celery
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/quality.txt
# django
# djangorestframework
beautifulsoup4==4.12.3
# via
# -r requirements/quality.txt
# wagtail
boto3==1.34.75
boto3==1.34.79
# via -r requirements/quality.txt
botocore==1.34.75
botocore==1.34.79
# via
# -r requirements/quality.txt
# boto3
Expand Down Expand Up @@ -67,7 +68,7 @@ click-log==0.4.0
# via
# -r requirements/quality.txt
# edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -187,7 +188,7 @@ drf-yasg==1.21.7
# via
# -r requirements/quality.txt
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
edx-api-doc-tools==1.8.0
# via -r requirements/quality.txt
edx-auth-backends==4.3.0
# via -r requirements/quality.txt
Expand Down Expand Up @@ -222,7 +223,7 @@ exceptiongroup==1.2.0
# pytest
factory-boy==3.3.0
# via -r requirements/quality.txt
faker==24.4.0
faker==24.7.1
# via
# -r requirements/quality.txt
# factory-boy
Expand Down Expand Up @@ -280,7 +281,7 @@ laces==0.1.1
# via
# -r requirements/quality.txt
# wagtail
lxml==5.2.0
lxml==5.2.1
# via edx-i18n-tools
markupsafe==2.1.5
# via
Expand Down Expand Up @@ -318,7 +319,7 @@ packaging==24.0
# pyproject-api
# pytest
# tox
path==16.10.0
path==16.13.0
# via edx-i18n-tools
pbr==6.0.0
# via
Expand Down Expand Up @@ -524,7 +525,7 @@ typeguard==4.2.1
# via
# -r requirements/quality.txt
# inflect
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/quality.txt
# asgiref
Expand All @@ -547,7 +548,7 @@ virtualenv==20.25.1
# via
# -r requirements/quality.txt
# tox
wagtail==6.0.1
wagtail==6.0.2
# via -r requirements/quality.txt
webencodings==0.5.1
# via
Expand All @@ -561,3 +562,7 @@ zipp==3.18.1
# via
# -r requirements/quality.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.2.0
# via -r requirements/quality.txt
20 changes: 12 additions & 8 deletions requirements/doc.txt
Expand Up @@ -22,7 +22,7 @@ astroid==3.1.0
# pylint-celery
babel==2.14.0
# via sphinx
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/test.txt
# django
Expand All @@ -31,9 +31,9 @@ beautifulsoup4==4.12.3
# via
# -r requirements/test.txt
# wagtail
boto3==1.34.75
boto3==1.34.79
# via -r requirements/test.txt
botocore==1.34.75
botocore==1.34.79
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -70,7 +70,7 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -190,7 +190,7 @@ drf-yasg==1.21.7
# via
# -r requirements/test.txt
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
edx-api-doc-tools==1.8.0
# via -r requirements/test.txt
edx-auth-backends==4.3.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -223,7 +223,7 @@ exceptiongroup==1.2.0
# pytest
factory-boy==3.3.0
# via -r requirements/test.txt
faker==24.4.0
faker==24.7.1
# via
# -r requirements/test.txt
# factory-boy
Expand Down Expand Up @@ -543,7 +543,7 @@ typeguard==4.2.1
# via
# -r requirements/test.txt
# inflect
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/test.txt
# asgiref
Expand All @@ -566,7 +566,7 @@ virtualenv==20.25.1
# via
# -r requirements/test.txt
# tox
wagtail==6.0.1
wagtail==6.0.2
# via -r requirements/test.txt
webencodings==0.5.1
# via
Expand All @@ -580,3 +580,7 @@ zipp==3.18.1
# via
# -r requirements/test.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.2.0
# via -r requirements/test.txt
18 changes: 11 additions & 7 deletions requirements/production.txt
Expand Up @@ -13,7 +13,7 @@ asgiref==3.8.1
# -r requirements/base.txt
# django
# django-cors-headers
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/base.txt
# django
Expand All @@ -22,11 +22,11 @@ beautifulsoup4==4.12.3
# via
# -r requirements/base.txt
# wagtail
boto3==1.34.75
boto3==1.34.79
# via
# -r requirements/base.txt
# -r requirements/production.in
botocore==1.34.75
botocore==1.34.79
# via
# -r requirements/base.txt
# boto3
Expand Down Expand Up @@ -138,7 +138,7 @@ drf-yasg==1.21.7
# via
# -r requirements/base.txt
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
edx-api-doc-tools==1.8.0
# via -r requirements/base.txt
edx-auth-backends==4.3.0
# via -r requirements/base.txt
Expand Down Expand Up @@ -352,7 +352,7 @@ typeguard==4.2.1
# via
# -r requirements/base.txt
# inflect
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/base.txt
# asgiref
Expand All @@ -368,7 +368,7 @@ urllib3==1.26.18
# -r requirements/base.txt
# botocore
# requests
wagtail==6.0.1
wagtail==6.0.2
# via -r requirements/base.txt
webencodings==0.5.1
# via
Expand All @@ -388,4 +388,8 @@ zope-interface==6.2
# via gevent

# The following packages are considered to be unsafe in a requirements file:
# setuptools
setuptools==69.2.0
# via
# -r requirements/base.txt
# zope-event
# zope-interface
20 changes: 12 additions & 8 deletions requirements/quality.txt
Expand Up @@ -18,7 +18,7 @@ astroid==3.1.0
# -r requirements/test.txt
# pylint
# pylint-celery
backports-zoneinfo==0.2.1
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -r requirements/test.txt
# django
Expand All @@ -27,9 +27,9 @@ beautifulsoup4==4.12.3
# via
# -r requirements/test.txt
# wagtail
boto3==1.34.75
boto3==1.34.79
# via -r requirements/test.txt
botocore==1.34.75
botocore==1.34.79
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -66,7 +66,7 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -178,7 +178,7 @@ drf-yasg==1.21.7
# via
# -r requirements/test.txt
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
edx-api-doc-tools==1.8.0
# via -r requirements/test.txt
edx-auth-backends==4.3.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -211,7 +211,7 @@ exceptiongroup==1.2.0
# pytest
factory-boy==3.3.0
# via -r requirements/test.txt
faker==24.4.0
faker==24.7.1
# via
# -r requirements/test.txt
# factory-boy
Expand Down Expand Up @@ -499,7 +499,7 @@ typeguard==4.2.1
# via
# -r requirements/test.txt
# inflect
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/test.txt
# asgiref
Expand All @@ -522,7 +522,7 @@ virtualenv==20.25.1
# via
# -r requirements/test.txt
# tox
wagtail==6.0.1
wagtail==6.0.2
# via -r requirements/test.txt
webencodings==0.5.1
# via
Expand All @@ -536,3 +536,7 @@ zipp==3.18.1
# via
# -r requirements/test.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.2.0
# via -r requirements/test.txt