Skip to content

Commit

Permalink
feat: Adding python3.12 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
awais786 authored and UsamaSadiq committed Jul 31, 2024
1 parent 140b524 commit 6a531bc
Show file tree
Hide file tree
Showing 14 changed files with 129 additions and 110 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with t
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/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
# Let tox control the Django version for tests
grep -e "^django==" requirements/production.txt > requirements/django.txt
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ mock
inflect
social-auth-core
boto3
setuptools
24 changes: 14 additions & 10 deletions requirements/base.txt
Original file line number Diff line number Diff line change
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.141
boto3==1.34.151
# via -r requirements/base.in
botocore==1.34.141
botocore==1.34.151
# via
# boto3
# s3transfer
Expand All @@ -32,7 +33,7 @@ charset-normalizer==3.3.2
# via requests
click==8.1.7
# via edx-django-utils
cryptography==42.0.8
cryptography==43.0.0
# via
# pyjwt
# social-auth-core
Expand Down Expand Up @@ -114,7 +115,7 @@ edx-auth-backends==4.3.0
# via -r requirements/base.in
edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-utils==5.14.2
edx-django-utils==5.15.0
# via
# -r requirements/base.in
# edx-drf-extensions
Expand Down Expand Up @@ -155,7 +156,7 @@ more-itertools==10.3.0
# via inflect
mysqlclient==2.2.4
# via -r requirements/base.in
newrelic==9.11.0
newrelic==9.12.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -171,7 +172,7 @@ pillow==10.4.0
# via
# pillow-heif
# wagtail
pillow-heif==0.17.0
pillow-heif==0.18.0
# via willow
psutil==6.0.0
# via edx-django-utils
Expand Down Expand Up @@ -226,7 +227,7 @@ six==1.16.0
# python-dateutil
slumber==0.7.1
# via edx-rest-api-client
social-auth-app-django==5.4.1
social-auth-app-django==5.4.2
# via
# -r requirements/base.in
# edx-auth-backends
Expand All @@ -237,7 +238,7 @@ social-auth-core==4.5.4
# social-auth-app-django
soupsieve==2.5
# via beautifulsoup4
sqlparse==0.5.0
sqlparse==0.5.1
# via django
stevedore==5.2.0
# via
Expand All @@ -259,7 +260,7 @@ urllib3==1.26.19
# via
# botocore
# requests
wagtail==6.1.2
wagtail==6.1.3
# via -r requirements/base.in
willow[heif]==1.8.0
# via
Expand All @@ -269,3 +270,6 @@ zipp==3.19.2
# via
# -r requirements/base.in
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
8 changes: 8 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
Expand All @@ -30,3 +31,10 @@ django-simple-history==3.0.0
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7

# Cause: https://github.com/openedx/event-tracking/pull/290
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
# We will pin event-tracking to do not break existing installations
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
# has been resolved and edx-platform is running with pymongo>=4.4.0
event-tracking<2.4.1
4 changes: 4 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
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
53 changes: 25 additions & 28 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,29 @@ asgiref==3.8.1
# -r requirements/quality.txt
# django
# django-cors-headers
astroid==3.2.2
astroid==3.2.4
# via
# -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.141
boto3==1.34.151
# via -r requirements/quality.txt
botocore==1.34.141
botocore==1.34.151
# via
# -r requirements/quality.txt
# boto3
# s3transfer
cachetools==5.3.3
cachetools==5.4.0
# via
# -r requirements/quality.txt
# tox
Expand Down Expand Up @@ -75,11 +76,11 @@ colorama==0.4.6
# via
# -r requirements/quality.txt
# tox
coverage[toml]==7.5.4
coverage[toml]==7.6.0
# via
# -r requirements/quality.txt
# pytest-cov
cryptography==42.0.8
cryptography==43.0.0
# via
# -r requirements/quality.txt
# pyjwt
Expand All @@ -90,7 +91,7 @@ defusedxml==0.8.0rc2
# python3-openid
# social-auth-core
# willow
diff-cover==9.1.0
diff-cover==9.1.1
# via -r requirements/dev.in
dill==0.3.8
# via
Expand Down Expand Up @@ -134,7 +135,7 @@ django-crum==0.7.9
# via
# -r requirements/quality.txt
# edx-django-utils
django-debug-toolbar==4.4.5
django-debug-toolbar==4.4.6
# via -r requirements/dev.in
django-dynamic-fixture==4.0.1
# via -r requirements/quality.txt
Expand Down Expand Up @@ -197,16 +198,16 @@ edx-auth-backends==4.3.0
# via -r requirements/quality.txt
edx-django-release-util==1.4.0
# via -r requirements/quality.txt
edx-django-utils==5.14.2
edx-django-utils==5.15.0
# via
# -r requirements/quality.txt
# edx-drf-extensions
# edx-rest-api-client
edx-drf-extensions==10.3.0
# via -r requirements/quality.txt
edx-i18n-tools==1.6.0
edx-i18n-tools==1.6.2
# via -r requirements/dev.in
edx-lint==5.3.6
edx-lint==5.3.7
# via -r requirements/quality.txt
edx-opaque-keys==2.10.0
# via
Expand All @@ -220,7 +221,7 @@ et-xmlfile==1.1.0
# via
# -r requirements/quality.txt
# openpyxl
exceptiongroup==1.2.1
exceptiongroup==1.2.2
# via
# -r requirements/quality.txt
# pytest
Expand Down Expand Up @@ -280,12 +281,8 @@ laces==0.1.1
# via
# -r requirements/quality.txt
# wagtail
lxml[html-clean,html_clean]==5.2.2
# via
# edx-i18n-tools
# lxml-html-clean
lxml-html-clean==0.1.1
# via lxml
lxml==5.2.2
# via edx-i18n-tools
markupsafe==2.1.5
# via
# -r requirements/quality.txt
Expand All @@ -302,7 +299,7 @@ more-itertools==10.3.0
# inflect
mysqlclient==2.2.4
# via -r requirements/quality.txt
newrelic==9.11.0
newrelic==9.12.0
# via
# -r requirements/quality.txt
# edx-django-utils
Expand All @@ -322,7 +319,7 @@ packaging==24.1
# pyproject-api
# pytest
# tox
path==16.14.0
path==16.16.0
# via edx-i18n-tools
pbr==6.0.0
# via
Expand All @@ -333,7 +330,7 @@ pillow==10.4.0
# -r requirements/quality.txt
# pillow-heif
# wagtail
pillow-heif==0.17.0
pillow-heif==0.18.0
# via
# -r requirements/quality.txt
# willow
Expand Down Expand Up @@ -373,7 +370,7 @@ pyjwt[crypto]==2.8.0
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pylint==3.2.5
pylint==3.2.6
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -405,7 +402,7 @@ pyproject-api==1.7.1
# via
# -r requirements/quality.txt
# tox
pytest==8.2.2
pytest==8.3.2
# via
# -r requirements/quality.txt
# pytest-cov
Expand Down Expand Up @@ -477,7 +474,7 @@ snowballstemmer==2.2.0
# via
# -r requirements/quality.txt
# pydocstyle
social-auth-app-django==5.4.1
social-auth-app-django==5.4.2
# via
# -r requirements/quality.txt
# edx-auth-backends
Expand All @@ -490,7 +487,7 @@ soupsieve==2.5
# via
# -r requirements/quality.txt
# beautifulsoup4
sqlparse==0.5.0
sqlparse==0.5.1
# via
# -r requirements/quality.txt
# django
Expand All @@ -517,7 +514,7 @@ tomli==2.0.1
# pyproject-api
# pytest
# tox
tomlkit==0.12.5
tomlkit==0.13.0
# via
# -r requirements/quality.txt
# pylint
Expand Down Expand Up @@ -549,7 +546,7 @@ virtualenv==20.26.3
# via
# -r requirements/quality.txt
# tox
wagtail==6.1.2
wagtail==6.1.3
# via -r requirements/quality.txt
willow[heif]==1.8.0
# via
Expand Down
Loading

0 comments on commit 6a531bc

Please sign in to comment.