Skip to content

Commit

Permalink
Merge pull request #265 from openedx/jenkins/add-python312-support-a7…
Browse files Browse the repository at this point in the history
…01e1b

feat: add python 3.11 support
  • Loading branch information
feanil committed Apr 9, 2024
2 parents 488c1da + f400d2e commit c32b68c
Show file tree
Hide file tree
Showing 16 changed files with 111 additions and 142 deletions.
46 changes: 21 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,30 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ["3.8"]
toxenv:
[
celery44-django32,
celery52-django32,
celery53-django32,
celery53-django42,
]
python-version:
- "3.8"
- '3.11'
toxenv: [celery53-django42]

steps:
- uses: actions/checkout@v2
- name: setup python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v2
- name: setup python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Start MongoDB
uses: supercharge/mongodb-github-action@1.6.0
with:
mongodb-version: 4.0
- name: Start MongoDB
uses: supercharge/mongodb-github-action@1.6.0
with:
mongodb-version: 4.0

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

- name: Install Dependencies
run: make test.setup install
- name: Install Dependencies
run: make test.setup install

- name: Run Tests
env:
TOXENV: ${{ matrix.toxenv }}
run: tox
- name: Run Tests
env:
TOXENV: ${{ matrix.toxenv }}
run: tox
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade -o requirements/celery44.txt requirements/celery44.in
# Let tox control the Django version for tests
grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery52.txt
grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery53.txt
sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
sed -i.tmp '/^amqp==/d' requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion eventtracking/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""A simple event tracking library"""

__version__ = '2.3.2'
__version__ = '2.4.0'
30 changes: 15 additions & 15 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
#
amqp==5.2.0
# via kombu
asgiref==3.7.2
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
# kombu
billiard==4.2.0
# via celery
Expand All @@ -30,15 +32,15 @@ click==8.1.7
# click-repl
# code-annotations
# edx-django-utils
click-didyoumean==0.3.0
click-didyoumean==0.3.1
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
code-annotations==1.6.0
code-annotations==1.7.0
# via edx-toggles
django==3.2.24
django==4.2.11
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand All @@ -55,49 +57,47 @@ django-waffle==4.1.0
# via
# edx-django-utils
# edx-toggles
edx-django-utils==5.10.1
edx-django-utils==5.12.0
# via
# -r requirements/base.in
# edx-toggles
# openedx-events
edx-opaque-keys[django]==2.5.1
# via openedx-events
edx-toggles==5.1.1
edx-toggles==5.2.0
# via -r requirements/base.in
fastavro==1.9.4
# via openedx-events
jinja2==3.1.3
# via code-annotations
kombu==5.3.5
kombu==5.3.6
# via celery
markupsafe==2.1.5
# via jinja2
newrelic==9.7.0
newrelic==9.8.0
# via edx-django-utils
openedx-events==9.5.2
openedx-events==9.6.0
# via -r requirements/base.in
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
pymongo==3.13.0
# via
# -r requirements/base.in
# edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via celery
python-slugify==8.0.4
# via code-annotations
pytz==2024.1
# via
# -r requirements/base.in
# django
# via -r requirements/base.in
pyyaml==6.0.1
# via code-annotations
six==1.16.0
Expand Down
1 change: 0 additions & 1 deletion requirements/celery44.in

This file was deleted.

20 changes: 0 additions & 20 deletions requirements/celery44.txt

This file was deleted.

9 changes: 0 additions & 9 deletions requirements/celery52.txt

This file was deleted.

16 changes: 8 additions & 8 deletions requirements/celery53.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
amqp==5.1.1
billiard==4.1.0
celery==5.3.1
click==8.1.6
click-didyoumean==0.3.0
amqp==5.2.0
billiard==4.2.0
celery==5.3.6
click==8.1.7
click-didyoumean==0.3.1
click-repl==0.3.0
kombu==5.3.1
prompt-toolkit==3.0.39
vine==5.0.0
kombu==5.3.6
prompt-toolkit==3.0.43
vine==5.1.0
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
coverage==7.4.3
coverage==7.4.4
# via -r requirements/ci.in
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 @@ -34,7 +34,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.1
# via tox
3 changes: 3 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@

# maintaining the production version.
celery<6.0

# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
Loading

0 comments on commit c32b68c

Please sign in to comment.