Skip to content

Commit

Permalink
feat: add python311 support
Browse files Browse the repository at this point in the history
  • Loading branch information
edx-requirements-bot authored and UsamaSadiq committed Mar 28, 2024
1 parent 975d364 commit a1f54b6
Show file tree
Hide file tree
Showing 20 changed files with 424 additions and 434 deletions.
51 changes: 22 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [master]
pull_request:
branches:
- "**"
- "**"

jobs:
run_tests:
Expand All @@ -14,37 +14,30 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ["3.8"]
toxenv:
[
quality,
docs,
pii_check,
django32-celery53,
django42-celery53,
]
python-version: ['3.8', '3.11']
toxenv: [quality, docs, pii_check, django42-celery53]

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

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

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

- name: Run Tests
env:
TOXENV: ${{ matrix.toxenv }}
run: tox
- name: Run Tests
env:
TOXENV: ${{ matrix.toxenv }}
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django42-celery53'
uses: codecov/codecov-action@v3
with:
flags: unittests
fail_ci_if_error: true
- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django42-celery53'
uses: codecov/codecov-action@v3
with:
flags: unittests
fail_ci_if_error: true
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ Change Log
Unreleased


[1.1.0] - 2024-03-22
~~~~~~~~~~~~~~~~~~~~
* Support added for ``Python 3.11``
* Support dropped for ``Django<4.2``

[1.0.2] - 2023-06-14
~~~~~~~~~~~~~~~~~~~~
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
pip-compile --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
Expand All @@ -47,7 +47,7 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
# Let tox control the Django,celery versions for tests
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt
grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery50.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 '/^amqp==/d' requirements/test.txt
sed -i.tmp '/^anyjson==/d' requirements/test.txt
sed -i.tmp '/^billiard==/d' requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion bulk_grades/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
Support for bulk scoring and grading.
"""

__version__ = '1.0.2'
__version__ = '1.1.0'

default_app_config = 'bulk_grades.apps.BulkGradesConfig' # pylint: disable=invalid-name
72 changes: 36 additions & 36 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,30 @@
#
# make upgrade
#
amqp==5.1.1
amqp==5.2.0
# via kombu
asgiref==3.7.2
asgiref==3.8.0
# via django
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.1.0
billiard==4.2.0
# via celery
celery==5.3.1
celery==5.3.6
# via
# -c requirements/constraints.txt
# edx-celeryutils
certifi==2023.7.22
certifi==2024.2.2
# via requests
cffi==1.15.1
cffi==1.16.0
# via pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
click==8.1.6
click==8.1.7
# via
# celery
# click-didyoumean
Expand All @@ -37,13 +40,13 @@ click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
django==3.2.20
django==4.2.11
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-crum
# django-model-utils
# django-waffle
# djangorestframework
# edx-celeryutils
# edx-django-utils
Expand All @@ -53,79 +56,76 @@ django-crum==0.7.9
# via
# edx-django-utils
# super-csv
django-model-utils==4.3.1
django-model-utils==4.4.0
# via
# -r requirements/base.in
# edx-celeryutils
# super-csv
django-waffle==3.0.0
django-waffle==4.1.0
# via edx-django-utils
djangorestframework==3.14.0
djangorestframework==3.15.0
# via super-csv
edx-celeryutils==1.2.2
edx-celeryutils==1.2.5
# via super-csv
edx-django-utils==5.6.0
edx-django-utils==5.11.0
# via super-csv
edx-opaque-keys==2.3.0
edx-opaque-keys==2.5.1
# via -r requirements/base.in
idna==3.4
idna==3.6
# via requests
jsonfield==3.1.0
# via edx-celeryutils
kombu==5.3.1
kombu==5.3.5
# via celery
newrelic==8.8.1
newrelic==9.7.1
# via edx-django-utils
pbr==5.11.1
pbr==6.0.0
# via stevedore
prompt-toolkit==3.0.39
prompt-toolkit==3.0.43
# via click-repl
psutil==5.9.5
psutil==5.9.8
# via edx-django-utils
pycparser==2.21
# via cffi
pymongo==3.13.0
# via edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via celery
pytz==2023.3
# via
# django
# djangorestframework
requests==2.31.0
# via
# -r requirements/base.in
# slumber
simplejson==3.19.1
simplejson==3.19.2
# via super-csv
six==1.16.0
# via python-dateutil
slumber==0.7.1
# via -r requirements/base.in
sqlparse==0.4.4
# via django
stevedore==5.1.0
stevedore==5.2.0
# via
# edx-django-utils
# edx-opaque-keys
super-csv==3.0.1
super-csv==3.1.0
# via -r requirements/base.in
typing-extensions==4.7.1
typing-extensions==4.10.0
# via
# asgiref
# edx-opaque-keys
# kombu
tzdata==2023.3
tzdata==2024.1
# via
# backports-zoneinfo
# celery
urllib3==2.0.4
urllib3==2.2.1
# via requests
vine==5.0.0
vine==5.1.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.6
wcwidth==0.2.13
# via prompt-toolkit
5 changes: 0 additions & 5 deletions requirements/celery44.txt

This file was deleted.

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

This file was deleted.

14 changes: 7 additions & 7 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
amqp==5.2.0
billiard==4.2.0
celery==5.3.6
click==8.1.7
click-didyoumean==0.3.0
click-repl==0.3.0
kombu==5.3.1
prompt-toolkit==3.0.39
vine==5.0.0
kombu==5.3.5
prompt-toolkit==3.0.43
vine==5.1.0
40 changes: 24 additions & 16 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,37 @@
#
# make upgrade
#
coverage==7.2.7
cachetools==5.3.3
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
coverage==7.4.4
# via -r requirements/ci.in
distlib==0.3.7
distlib==0.3.8
# via virtualenv
filelock==3.12.2
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.1
# via tox
platformdirs==3.9.1
# via virtualenv
pluggy==1.2.0
# via tox
py==1.11.0
packaging==24.0
# via
# pyproject-api
# tox
platformdirs==4.2.0
# via
# tox
# virtualenv
pluggy==1.4.0
# via tox
six==1.16.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
virtualenv==20.24.2
# pyproject-api
# tox
tox==4.14.1
# via -r requirements/ci.in
virtualenv==20.25.1
# via tox
5 changes: 2 additions & 3 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
# Common constraints for edx repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

# Stay on an LTS release
django<4.0

# pinning celery to latest release
celery<6.0

# For python greater than or equal to 3.9 backports.zoneinfo causing failures
backports.zoneinfo;python_version<'3.9'
Loading

0 comments on commit a1f54b6

Please sign in to comment.