Skip to content

Commit

Permalink
Merge pull request #1188 from openedx/pythonupgrade
Browse files Browse the repository at this point in the history
Add support for python 3.11 & 3.12
  • Loading branch information
Feanil Patel authored Apr 19, 2024
2 parents 97cb32a + a472b38 commit a4bae77
Show file tree
Hide file tree
Showing 14 changed files with 77 additions and 73 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,17 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-20.04"]
python-version: ["3.8"]
python-version: ["3.8", "3.11", "3.12"]
node-version: ["16"]
toxenv:
[
"django32-drflatest",
"django40-drflatest",
"django42-drflatest",
"quality",
"pii_check",
"version_check",
"js_tests",
"js_lint",
"rst_validation",
"translations-django32",
"translations-django42",
]
steps:
Expand Down Expand Up @@ -59,8 +56,9 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.toxenv == 'django42-drflatest'
uses: codecov/codecov-action@v3
if: matrix.python-version == '3.8' && matrix.toxenv == 'django42-drflatest'
uses: codecov/codecov-action@v4
with:
flags: unittests
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/migrations-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-20.04 ]
python-version: [ 3.8 ]
python-version: [ "3.8", "3.11", "3.12" ]

steps:
- name: Checkout repo
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ Change Log
Unreleased
~~~~~~~~~~

[4.16.1]
[4.17.0]
~~~~~~~~~~~~~~~~~~~~~
* Add support for Python 3.11 & 3.12

[4.16.1] - 2023-08-8
~~~~~~~~~~~~~~~~~~~~~
* Updated django-simple-history package to 3.3.0
* Created no-op migrations needed for new django-simple-history package version
Expand Down
2 changes: 1 addition & 1 deletion edx_proctoring/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"""

# Be sure to update the version number in edx_proctoring/package.json
__version__ = '4.16.1'
__version__ = '4.17.0'
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edx/edx-proctoring",
"//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
"version": "4.16.1",
"version": "4.17.0",
"main": "edx_proctoring/static/index.js",
"scripts": {
"test": "gulp test"
Expand Down
35 changes: 18 additions & 17 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ asgiref==3.8.1
# via django
attrs==23.2.0
# via openedx-events
backports-zoneinfo[tzdata]==0.2.1
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# celery
# django
# djangorestframework
Expand Down Expand Up @@ -47,7 +48,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
code-annotations==1.7.0
code-annotations==1.8.0
# via edx-toggles
cryptography==42.0.5
# via pyjwt
Expand All @@ -74,7 +75,7 @@ django-crum==0.7.9
# edx-toggles
django-ipware==6.0.4
# via -r requirements/base.in
django-model-utils==4.4.0
django-model-utils==4.5.0
# via
# -r requirements/base.in
# edx-when
Expand All @@ -99,15 +100,15 @@ djangorestframework==3.15.1
# edx-drf-extensions
drf-jwt==1.19.2
# via edx-drf-extensions
edx-django-utils==5.11.0
edx-django-utils==5.12.0
# via
# edx-drf-extensions
# edx-rest-api-client
# edx-toggles
# edx-when
# event-tracking
# openedx-events
edx-drf-extensions==10.2.0
edx-drf-extensions==10.3.0
# via
# -r requirements/base.in
# edx-when
Expand All @@ -117,13 +118,13 @@ edx-opaque-keys[django]==2.5.1
# edx-drf-extensions
# edx-when
# openedx-events
edx-rest-api-client==5.6.1
edx-rest-api-client==5.7.0
# via -r requirements/base.in
edx-toggles==5.1.1
edx-toggles==5.2.0
# via event-tracking
edx-when==2.4.0
edx-when==2.5.0
# via -r requirements/base.in
event-tracking==2.3.1
event-tracking==2.3.2
# via -r requirements/base.in
fastavro==1.9.4
# via openedx-events
Expand All @@ -135,9 +136,9 @@ jinja2==3.1.3
# via code-annotations
jsonfield==3.1.0
# via -r requirements/base.in
kombu==5.3.5
kombu==5.3.6
# via celery
lxml==5.1.0
lxml==5.2.1
# via xblock
mako==1.3.2
# via xblock
Expand All @@ -146,17 +147,17 @@ markupsafe==2.1.5
# jinja2
# mako
# xblock
newrelic==9.7.1
newrelic==9.8.0
# via edx-django-utils
openedx-events==9.5.2
openedx-events==9.7.0
# via event-tracking
pbr==6.0.0
# via stevedore
prompt-toolkit==3.0.43
# via click-repl
psutil==5.9.8
# via edx-django-utils
pycparser==2.21
pycparser==2.22
# via cffi
pycryptodomex==3.20.0
# via -r requirements/base.in
Expand Down Expand Up @@ -217,7 +218,7 @@ stevedore==5.2.0
# edx-opaque-keys
text-unidecode==1.3
# via python-slugify
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# asgiref
# edx-opaque-keys
Expand All @@ -235,11 +236,11 @@ vine==5.1.0
# kombu
wcwidth==0.2.13
# via prompt-toolkit
web-fragments==2.1.0
web-fragments==2.2.0
# via xblock
webob==1.8.7
# via xblock
xblock==3.0.0
xblock==3.1.0
# via edx-when

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion requirements/celery50.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ celery==5.3.6
click==8.1.7
click-didyoumean==0.3.1
click-repl==0.3.0
kombu==5.3.5
kombu==5.3.6
prompt-toolkit==3.0.43
vine==5.1.0
5 changes: 4 additions & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ click>=8.0,<9.0
django-webpack-loader<1.0.0

# incremental upgrade plan.
django-simple-history<=3.1.1
django-simple-history<=3.1.1

#Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
20 changes: 10 additions & 10 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ astroid==3.1.0
# via
# pylint
# pylint-celery
backports-zoneinfo==0.2.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
cachetools==5.3.3
# via tox
chardet==5.2.0
Expand All @@ -29,12 +31,10 @@ click==8.1.7
# typer
click-log==0.4.0
# via edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via edx-lint
colorama==0.4.6
# via
# tox
# typer
# via tox
diff-cover==8.0.3
# via -r requirements/dev.in
dill==0.3.8
Expand Down Expand Up @@ -72,7 +72,7 @@ jinja2==3.1.3
# via
# code-annotations
# diff-cover
lxml==5.1.0
lxml==5.2.1
# via edx-i18n-tools
markdown-it-py==3.0.0
# via rich
Expand All @@ -86,7 +86,7 @@ packaging==24.0
# via
# pyproject-api
# tox
path==16.10.0
path==16.13.0
# via
# edx-i18n-tools
# path-py
Expand Down Expand Up @@ -166,9 +166,9 @@ tomlkit==0.12.4
# via pylint
tox==4.14.2
# via -r requirements/dev.in
typer[all]==0.10.0
typer[all]==0.12.1
# via rstcheck
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# annotated-types
# asgiref
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
build==1.1.1
build==1.2.1
# via pip-tools
click==8.1.7
# via
Expand Down
14 changes: 7 additions & 7 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ astroid==3.1.0
# via
# pylint
# pylint-celery
backports-zoneinfo==0.2.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
click==8.1.7
# via
# -c requirements/constraints.txt
Expand All @@ -23,10 +25,8 @@ click==8.1.7
# typer
click-log==0.4.0
# via edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via edx-lint
colorama==0.4.6
# via typer
dill==0.3.8
# via pylint
django==4.2.11
Expand Down Expand Up @@ -110,9 +110,9 @@ tomli==2.0.1
# via pylint
tomlkit==0.12.4
# via pylint
typer[all]==0.10.0
typer[all]==0.12.1
# via rstcheck
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# annotated-types
# asgiref
Expand Down
Loading

0 comments on commit a4bae77

Please sign in to comment.