Skip to content

Commit

Permalink
Merge pull request #169 from openedx/python-support
Browse files Browse the repository at this point in the history
feat: adding python3.11 and 3.12 support.
  • Loading branch information
Feanil Patel authored Apr 8, 2024
2 parents 6d27e6f + fb90d89 commit 5cd37d3
Show file tree
Hide file tree
Showing 18 changed files with 406 additions and 200 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ["3.8"]
python-version: ["3.8", "3.11", "3.12"]
toxenv:
[
django32-celery53-drflatest,
django42-celery53-drflatest,
quality,
docs,
Expand All @@ -32,7 +31,8 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Install pip
run: pip install -r requirements/pip.txt
run:
pip install -r requirements/pip.txt

- name: Install Dependencies
run: pip install -r requirements/ci.txt
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ Change Log
Unreleased
----------
[3.2.0] - 2023-07-31
~~~~~~~~~~~~~~~~~~~~

* Added support of python 3.11 and 3.12
* Dropped django32 support.


[3.1.0] - 2023-07-31
~~~~~~~~~~~~~~~~~~~~
Expand Down
72 changes: 50 additions & 22 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,39 @@
#
# make upgrade
#
amqp==2.6.1
amqp==5.2.0
# via kombu
asgiref==3.7.2
asgiref==3.8.1
# via django
billiard==3.6.4.0
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
celery==4.4.7
celery==5.3.6
# via
# -c requirements/constraints.txt
# edx-celeryutils
cffi==1.16.0
# via pynacl
click==8.1.7
# via edx-django-utils
django==3.2.24
# via
# celery
# click-didyoumean
# click-plugins
# click-repl
# edx-django-utils
click-didyoumean==0.3.1
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -33,46 +51,56 @@ django-crum==0.7.9
# via
# -r requirements/base.in
# edx-django-utils
django-model-utils==4.4.0
django-model-utils==4.5.0
# via
# -r requirements/base.in
# edx-celeryutils
django-waffle==4.1.0
# via edx-django-utils
djangorestframework==3.14.0
djangorestframework==3.15.1
# via -r requirements/base.in
edx-celeryutils==1.2.5
edx-celeryutils==1.3.0
# via -r requirements/base.in
edx-django-utils==5.10.1
edx-django-utils==5.12.0
# via -r requirements/base.in
jsonfield==3.1.0
# via edx-celeryutils
kombu==4.6.11
kombu==5.3.6
# via celery
newrelic==9.6.0
newrelic==9.8.0
# via edx-django-utils
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
pynacl==1.5.0
# via edx-django-utils
pytz==2024.1
# via
# celery
# django
# djangorestframework
python-dateutil==2.9.0.post0
# via celery
simplejson==3.19.2
# via -r requirements/base.in
six==1.16.0
# via python-dateutil
sqlparse==0.4.4
# via django
stevedore==5.1.0
stevedore==5.2.0
# via edx-django-utils
typing-extensions==4.9.0
# via asgiref
vine==1.3.0
typing-extensions==4.11.0
# via
# asgiref
# kombu
tzdata==2024.1
# via
# backports-zoneinfo
# celery
vine==5.1.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.13
# via prompt-toolkit
12 changes: 6 additions & 6 deletions requirements/celery44.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
amqp==2.6.1
billiard==3.6.4.0
celery==4.4.7
click==8.1.3
kombu==4.6.11
vine==1.3.0
amqp==5.2.0
billiard==4.2.0
celery==5.3.6
click==8.1.6
kombu==5.3.5
vine==5.1.0
13 changes: 8 additions & 5 deletions requirements/celery53.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
amqp==2.6.1
billiard==3.6.4.0
celery==4.4.7
amqp==5.2.0
billiard==4.2.0
celery==5.3.6
click==8.1.7
kombu==4.6.11
vine==1.3.0
click-didyoumean==0.3.1
click-repl==0.3.0
kombu==5.3.6
prompt-toolkit==3.0.43
vine==5.1.0
10 changes: 5 additions & 5 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via
# pyproject-api
# tox
Expand All @@ -32,7 +32,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
tox==4.14.2
# via -r requirements/ci.in
virtualenv==20.25.0
virtualenv==20.25.1
# via tox
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,20 @@


# using LTS django version
Django<4.0
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
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
7 changes: 6 additions & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,9 @@
# Common constraints for edx repos
-c common_constraints.txt

celery<5.0 # we still want to support celery 4
# As it is not clarified what exact breaking changes will be introduced as per
# the next major release, ensure the installed version is within boundaries.
celery>=5.2.2,<6.0.0


backports.zoneinfo;python_version<"3.9"
Loading

0 comments on commit 5cd37d3

Please sign in to comment.