Skip to content

Commit

Permalink
Merge pull request #155 from openedx/zshkoor/django42-upgrade
Browse files Browse the repository at this point in the history
fix: Added support for Django 4.2
  • Loading branch information
zubairshakoorarbisoft authored Jul 25, 2023
2 parents 252f411 + 3384f06 commit c2ffaf5
Show file tree
Hide file tree
Showing 15 changed files with 331 additions and 229 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ jobs:
quality,
docs,
pii_check,
django32-celery44,
django32-celery50,
django40-celery44,
django40-celery50,
django32-celery53,
django42-celery53,
]

steps:
Expand All @@ -45,7 +43,7 @@ jobs:
run: tox

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



[1.0.2] - 2023-06-14
~~~~~~~~~~~~~~~~~~~~
* Support added for Django 4.2.
* Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
deprecated

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.1'
__version__ = '1.0.2'

default_app_config = 'bulk_grades.apps.BulkGradesConfig' # pylint: disable=invalid-name
51 changes: 32 additions & 19 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,25 @@
#
amqp==5.1.1
# via kombu
asgiref==3.6.0
asgiref==3.7.2
# via django
billiard==3.6.4.0
backports-zoneinfo[tzdata]==0.2.1
# via
# celery
# kombu
billiard==4.1.0
# via celery
celery==5.2.7
celery==5.3.1
# via
# -c requirements/constraints.txt
# edx-celeryutils
certifi==2022.12.7
certifi==2023.7.22
# via requests
cffi==1.15.1
# via pynacl
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via requests
click==8.1.3
click==8.1.6
# via
# celery
# click-didyoumean
Expand All @@ -31,9 +35,9 @@ click-didyoumean==0.3.0
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.2.0
click-repl==0.3.0
# via celery
django==3.2.18
django==3.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
Expand All @@ -60,54 +64,63 @@ djangorestframework==3.14.0
# via super-csv
edx-celeryutils==1.2.2
# via super-csv
edx-django-utils==5.3.0
edx-django-utils==5.6.0
# via super-csv
edx-opaque-keys==2.3.0
# via -r requirements/base.in
idna==3.4
# via requests
jsonfield==3.1.0
# via edx-celeryutils
kombu==5.2.4
kombu==5.3.1
# via celery
newrelic==8.8.0
newrelic==8.8.1
# via edx-django-utils
pbr==5.11.1
# via stevedore
prompt-toolkit==3.0.38
prompt-toolkit==3.0.39
# via click-repl
psutil==5.9.4
psutil==5.9.5
# 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
# via celery
pytz==2023.3
# via
# celery
# django
# djangorestframework
requests==2.28.2
requests==2.31.0
# via
# -r requirements/base.in
# slumber
simplejson==3.19.1
# via super-csv
six==1.16.0
# via click-repl
# via python-dateutil
slumber==0.7.1
# via -r requirements/base.in
sqlparse==0.4.3
sqlparse==0.4.4
# via django
stevedore==5.0.0
stevedore==5.1.0
# via
# edx-django-utils
# edx-opaque-keys
super-csv==3.0.1
# via -r requirements/base.in
urllib3==1.26.15
typing-extensions==4.7.1
# via
# asgiref
# kombu
tzdata==2023.3
# via
# backports-zoneinfo
# celery
urllib3==2.0.4
# via requests
vine==5.0.0
# via
Expand Down
12 changes: 6 additions & 6 deletions requirements/celery50.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
amqp==5.1.1
billiard==3.6.4.0
celery==5.2.7
click==8.1.3
billiard==4.1.0
celery==5.3.1
click==8.1.6
click-didyoumean==0.3.0
click-repl==0.2.0
kombu==5.2.4
prompt-toolkit==3.0.38
click-repl==0.3.0
kombu==5.3.1
prompt-toolkit==3.0.39
vine==5.0.0
9 changes: 9 additions & 0 deletions requirements/celery53.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
amqp==5.1.1
billiard==4.1.0
celery==5.3.1
click==8.1.6
click-didyoumean==0.3.0
click-repl==0.3.0
kombu==5.3.1
prompt-toolkit==3.0.39
vine==5.0.0
14 changes: 7 additions & 7 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# make upgrade
#
coverage==7.2.3
coverage==7.2.7
# via -r requirements/ci.in
distlib==0.3.6
distlib==0.3.7
# via virtualenv
filelock==3.11.0
filelock==3.12.2
# via
# tox
# virtualenv
packaging==23.0
packaging==23.1
# via tox
platformdirs==3.2.0
platformdirs==3.9.1
# via virtualenv
pluggy==1.0.0
pluggy==1.2.0
# via tox
py==1.11.0
# via tox
Expand All @@ -31,5 +31,5 @@ tox==3.28.0
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
virtualenv==20.21.0
virtualenv==20.24.2
# via tox
Loading

0 comments on commit c2ffaf5

Please sign in to comment.