Skip to content

Commit

Permalink
Merge pull request #602 from openedx/jenkins/python312-support-f4ae2fc
Browse files Browse the repository at this point in the history
feat: add python311 support
  • Loading branch information
mumarkhan999 authored Apr 19, 2024
2 parents 39017d3 + a59563f commit 509959e
Show file tree
Hide file tree
Showing 11 changed files with 78 additions and 151 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8"]
python-version: ["3.8", "3.11"]
django-version: ["pinned"]
steps:
- uses: actions/checkout@v2
Expand All @@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8"]
python-version: ["3.8", "3.11"]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mysql8-migrations-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
pip uninstall -y mysqlclient
pip install --no-binary mysqlclient mysqlclient
pip uninstall -y xmlsec
pip install --no-binary xmlsec xmlsec
pip install --no-binary xmlsec xmlsec==1.3.13
- name: Initiate services
run: |
sudo /etc/init.d/mysql start
Expand Down
2 changes: 2 additions & 0 deletions pylintrc_tweaks
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@ disable+ =
consider-using-f-string,
missing-module-docstring,
missing-class-docstring,
missing-timeout,
unsupported-binary-operation,
useless-option-value,
unknown-option-value,
11 changes: 6 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,22 @@ backoff==1.10.0
# via
# -r requirements/base.in
# analytics-python
backports-zoneinfo[tzdata]==0.2.1
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# celery
# django
# djangorestframework
# kombu
billiard==4.2.0
# via celery
boto3==1.34.84
boto3==1.34.87
# via django-ses
botocore==1.34.84
botocore==1.34.87
# via
# boto3
# s3transfer
celery==5.3.6
celery==5.4.0
# via
# -r requirements/base.in
# django-celery-results
Expand Down Expand Up @@ -206,7 +207,7 @@ monotonic==1.6
# via analytics-python
mysqlclient==2.2.4
# via -r requirements/base.in
newrelic==9.8.0
newrelic==9.9.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand Down
14 changes: 2 additions & 12 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,5 @@
# Using the same version of diff-cover which is being used currently in edx-platform to avoid this conflict.
diff-cover==4.0.0

# Constraint from astroid 2.3.3
wrapt==1.11.*

# edx-lint>=5.3.0 and/or pylint>=2.15 throws a bunch of unknown option value errors
edx-lint<5.3
pylint<2.15
astroid<2.12

# Stay on LTS release
# This can be removed once all IDAs have been upgraded to Django 4.2
# and the global constraint has been updated from Django<4.0 to Django<4.3
Django<4.3
# For python greater than or equal to 3.9 backports.zoneinfo is causing failures
backports.zoneinfo;python_version<"3.9"
38 changes: 13 additions & 25 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ asgiref==3.8.1
# django
# django-cors-headers
# django-simple-history
astroid==2.11.7
astroid==3.1.0
# via
# -c requirements/constraints.txt
# -r requirements/validation.txt
# pylint
# pylint-celery
Expand All @@ -35,8 +34,9 @@ backoff==1.10.0
# via
# -r requirements/validation.txt
# analytics-python
backports-zoneinfo[tzdata]==0.2.1
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/validation.txt
# celery
# django
Expand All @@ -46,11 +46,11 @@ billiard==4.2.0
# via
# -r requirements/validation.txt
# celery
boto3==1.34.84
boto3==1.34.87
# via
# -r requirements/validation.txt
# django-ses
botocore==1.34.84
botocore==1.34.87
# via
# -r requirements/validation.txt
# boto3
Expand All @@ -59,7 +59,7 @@ build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
celery==5.3.6
celery==5.4.0
# via
# -r requirements/validation.txt
# django-celery-results
Expand Down Expand Up @@ -246,10 +246,8 @@ edx-drf-extensions==10.3.0
# edx-rbac
edx-i18n-tools==1.5.0
# via -r requirements/validation.txt
edx-lint==5.2.5
# via
# -c requirements/constraints.txt
# -r requirements/validation.txt
edx-lint==5.3.6
# via -r requirements/validation.txt
edx-opaque-keys==2.5.1
# via
# -r requirements/validation.txt
Expand All @@ -260,19 +258,19 @@ edx-rest-api-client==5.7.0
# via -r requirements/validation.txt
edx-toggles==5.2.0
# via -r requirements/validation.txt
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via
# -r requirements/validation.txt
# pytest
factory-boy==3.3.0
# via -r requirements/validation.txt
faker==24.9.0
faker==24.11.0
# via
# -r requirements/validation.txt
# factory-boy
freezegun==1.4.0
# via -r requirements/validation.txt
gunicorn==21.2.0
gunicorn==22.0.0
# via -r requirements/dev.in
idna==3.7
# via
Expand Down Expand Up @@ -334,10 +332,6 @@ kombu==5.3.7
# via
# -r requirements/validation.txt
# celery
lazy-object-proxy==1.10.0
# via
# -r requirements/validation.txt
# astroid
lxml==5.2.1
# via
# -r requirements/validation.txt
Expand All @@ -358,7 +352,7 @@ more-itertools==10.2.0
# via inflect
mysqlclient==2.2.4
# via -r requirements/validation.txt
newrelic==9.8.0
newrelic==9.9.0
# via
# -r requirements/validation.txt
# edx-django-utils
Expand Down Expand Up @@ -433,9 +427,8 @@ pyjwt[crypto]==2.8.0
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pylint==2.14.5
pylint==3.1.0
# via
# -c requirements/constraints.txt
# -r requirements/validation.txt
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -638,11 +631,6 @@ wheel==0.43.0
# via
# -r requirements/pip-tools.txt
# pip-tools
wrapt==1.11.2
# via
# -c requirements/constraints.txt
# -r requirements/validation.txt
# astroid
zipp==3.18.1
# via
# -r requirements/pip-tools.txt
Expand Down
39 changes: 12 additions & 27 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ asgiref==3.8.1
# django
# django-cors-headers
# django-simple-history
astroid==2.11.7
astroid==3.1.0
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# pylint
# pylint-celery
Expand All @@ -43,8 +42,9 @@ backoff==1.10.0
# via
# -r requirements/test.txt
# analytics-python
backports-zoneinfo[tzdata]==0.2.1
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# celery
# django
Expand All @@ -56,16 +56,16 @@ billiard==4.2.0
# via
# -r requirements/test.txt
# celery
boto3==1.34.84
boto3==1.34.87
# via
# -r requirements/test.txt
# django-ses
botocore==1.34.84
botocore==1.34.87
# via
# -r requirements/test.txt
# boto3
# s3transfer
celery==5.3.6
celery==5.4.0
# via
# -r requirements/test.txt
# django-celery-results
Expand Down Expand Up @@ -245,10 +245,8 @@ edx-drf-extensions==10.3.0
# via
# -r requirements/test.txt
# edx-rbac
edx-lint==5.2.5
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
edx-lint==5.3.6
# via -r requirements/test.txt
edx-opaque-keys==2.5.1
# via
# -r requirements/test.txt
Expand All @@ -259,13 +257,13 @@ edx-rest-api-client==5.7.0
# via -r requirements/test.txt
edx-toggles==5.2.0
# via -r requirements/test.txt
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via
# -r requirements/test.txt
# pytest
factory-boy==3.3.0
# via -r requirements/test.txt
faker==24.9.0
faker==24.11.0
# via
# -r requirements/test.txt
# factory-boy
Expand Down Expand Up @@ -324,10 +322,6 @@ kombu==5.3.7
# via
# -r requirements/test.txt
# celery
lazy-object-proxy==1.10.0
# via
# -r requirements/test.txt
# astroid
markupsafe==2.1.5
# via
# -r requirements/test.txt
Expand All @@ -342,7 +336,7 @@ monotonic==1.6
# analytics-python
mysqlclient==2.2.4
# via -r requirements/test.txt
newrelic==9.8.0
newrelic==9.9.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -408,9 +402,8 @@ pyjwt[crypto]==2.8.0
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pylint==2.14.5
pylint==3.1.0
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -619,16 +612,8 @@ wcwidth==0.2.13
# via
# -r requirements/test.txt
# prompt-toolkit
wrapt==1.11.2
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# astroid
zipp==3.18.1
# via
# -r requirements/test.txt
# importlib-metadata
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
# setuptools
13 changes: 7 additions & 6 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ backoff==1.10.0
# via
# -r requirements/base.txt
# analytics-python
backports-zoneinfo[tzdata]==0.2.1
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# celery
# django
Expand All @@ -40,16 +41,16 @@ billiard==4.2.0
# via
# -r requirements/base.txt
# celery
boto3==1.34.84
boto3==1.34.87
# via
# -r requirements/base.txt
# django-ses
botocore==1.34.84
botocore==1.34.87
# via
# -r requirements/base.txt
# boto3
# s3transfer
celery==5.3.6
celery==5.4.0
# via
# -r requirements/base.txt
# django-celery-results
Expand Down Expand Up @@ -215,7 +216,7 @@ gevent==24.2.1
# via -r requirements/production.in
greenlet==3.0.3
# via gevent
gunicorn==21.2.0
gunicorn==22.0.0
# via -r requirements/production.in
idna==3.7
# via
Expand Down Expand Up @@ -265,7 +266,7 @@ monotonic==1.6
# analytics-python
mysqlclient==2.2.4
# via -r requirements/base.txt
newrelic==9.8.0
newrelic==9.9.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand Down
Loading

0 comments on commit 509959e

Please sign in to comment.