Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: added support for django42 #151

Merged
merged 2 commits into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ jobs:
python-version: ["3.8"]
toxenv:
[
django32-celery44-drflatest,
django32-celery50-drflatest,
django40-celery44-drflatest,
django40-celery50-drflatest,
django32-celery53-drflatest,
django42-celery53-drflatest,
quality,
docs,
pii_check,
Expand All @@ -45,7 +43,7 @@ jobs:
run: tox

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

[3.1.0] - 2023-07-31
~~~~~~~~~~~~~~~~~~~~

* Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
deprecated. See https://github.com/openedx/edx-sphinx-theme/issues/184 for
more details.
* Added support of Django 4.2

[3.0.1] - 2022-02-17
~~~~~~~~~~~~~~~~~~~~

* fix: encode the csv data before save

[3.0.0] - 2022-02-17
~~~~~~~~~~~~~~~~~~~~

* Fix `dev.in` to pull from `ci.txt` rather than `travis.txt`.
* Dropped Django22, 30 and 31 support.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery44.txt
grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery53.txt
# Let tox control the versions for Django, DRF and celery for testing
sed -i.tmp '/^django==/d' requirements/test.txt
sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
Expand Down
19 changes: 11 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
amqp==2.6.1
# via kombu
asgiref==3.6.0
asgiref==3.7.2
# via django
billiard==3.6.4.0
# via celery
Expand All @@ -16,14 +16,15 @@ celery==4.4.7
# edx-celeryutils
cffi==1.15.1
# via pynacl
click==8.1.3
click==8.1.6
# via edx-django-utils
django==3.2.18
django==3.2.20
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
# django-crum
# django-model-utils
# django-waffle
# djangorestframework
# edx-celeryutils
# edx-django-utils
Expand All @@ -36,19 +37,19 @@ django-model-utils==4.3.1
# via
# -r requirements/base.in
# edx-celeryutils
django-waffle==3.0.0
django-waffle==4.0.0
# via edx-django-utils
djangorestframework==3.14.0
# via -r requirements/base.in
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
# via -r requirements/base.in
edx-django-utils==5.4.0
edx-django-utils==5.6.0
# via -r requirements/base.in
jsonfield==3.1.0
# via edx-celeryutils
kombu==4.6.11
# via celery
newrelic==8.8.0
newrelic==8.9.0
# via edx-django-utils
pbr==5.11.1
# via stevedore
Expand All @@ -67,8 +68,10 @@ simplejson==3.19.1
# via -r requirements/base.in
sqlparse==0.4.4
# via django
stevedore==5.0.0
stevedore==5.1.0
# via edx-django-utils
typing-extensions==4.7.1
# via asgiref
vine==1.3.0
# via
# amqp
Expand Down
6 changes: 6 additions & 0 deletions requirements/celery53.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
amqp==2.6.1
billiard==3.6.4.0
celery==4.4.7
click==8.1.6
kombu==4.6.11
vine==1.3.0
22 changes: 5 additions & 17 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,20 @@
#
# make upgrade
#
certifi==2022.12.7
# via requests
charset-normalizer==3.1.0
# via requests
coverage==7.2.3
# via codecov
distlib==0.3.6
distlib==0.3.7
# via virtualenv
filelock==3.12.0
filelock==3.12.2
# via
# tox
# virtualenv
idna==3.4
# via requests
packaging==23.1
# via tox
platformdirs==3.2.0
platformdirs==3.10.0
# via virtualenv
pluggy==1.0.0
pluggy==1.2.0
# via tox
py==1.11.0
# via tox
requests==2.28.2
# via codecov
six==1.16.0
# via tox
tomli==2.0.1
Expand All @@ -39,7 +29,5 @@ tox==3.28.0
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==1.26.15
# via requests
virtualenv==20.21.0
virtualenv==20.24.2
# via tox
5 changes: 0 additions & 5 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,3 @@ django-simple-history==3.0.0
# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0

# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version
# Pinning Sphinx version unless the compatibility issue gets resolved
# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
sphinx<6.0.0
Loading
Loading