Skip to content

Commit

Permalink
feat: Adding Django 4.2 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
@zubairshakoorarbisoft @awais786
zubairshakoorarbisoft authored and awais786 committed Jul 22, 2023
1 parent 0061119 commit 4ada2b7
Show file tree
Hide file tree
Showing 18 changed files with 72 additions and 80 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [django32-celery44-drf312, django32-celery44-drflatest, django32-celery52-drf312,
django32-celery52-drflatest, django40-celery44-drf312, django40-celery44-drflatest,
django40-celery52-drf312, django40-celery52-drflatest, quality, docs]
toxenv: [
django32-celery53-drf313, django32-celery53-drflatest,
django42-celery53-drflatest,
quality, docs
]

steps:
- uses: actions/checkout@v3
Expand All @@ -36,7 +38,7 @@ jobs:
run: tox

- name: Run coverage
if: matrix.python-version == '3.8' && matrix.toxenv == 'django32-celery52-drf312'
if: matrix.python-version == '3.8' && matrix.toxenv == 'django42-celery53-drflatest'
uses: codecov/codecov-action@v3
with:
flags: unittests
Expand Down
11 changes: 10 additions & 1 deletion CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,25 @@ Change Log
Unreleased
~~~~~~~~~~


[3.1.0] - 2023-07-21
~~~~~~~~~~~~~~~~~~~~

Added
+++++
* Added Django42 support in CI.
* Removed old versions of celery and drf version from ci.

Removed
+++++++

* Removed Python 3.5 support.

Chore
+++++
* Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
deprecated
* Upgraded celery to latest 5.x version.
* Add Support for Django 4.2

[2.2.0] - 2022-01-26
~~~~~~~~~~~~~~~~~~~~
Expand Down
11 changes: 0 additions & 11 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,8 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
# Let tox control the Django, djangorestframework, and celery versions for tests
grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery52.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
sed -i.tmp '/^anyjson==/d' requirements/test.txt
sed -i.tmp '/^billiard==/d' requirements/test.txt
sed -i.tmp '/^celery==/d' requirements/test.txt
sed -i.tmp '/^kombu==/d' requirements/test.txt
sed -i.tmp '/^vine==/d' requirements/test.txt
sed -i.tmp '/^click-didyoumean==/d' requirements/test.txt
sed -i.tmp '/^click==/d' requirements/test.txt
sed -i.tmp '/^prompt-toolkit==/d' requirements/test.txt

rm requirements/test.txt.tmp

pull_translations: ## pull translations from Transifex
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ celery==5.3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.in
click==8.1.4
click==8.1.6
# via
# celery
# click-didyoumean
Expand All @@ -43,7 +43,7 @@ djangorestframework==3.14.0
# via
# -r requirements/base.in
# drf-yasg
drf-yasg==1.21.6
drf-yasg==1.21.7
# via -r requirements/base.in
inflection==0.5.1
# via drf-yasg
Expand Down
5 changes: 0 additions & 5 deletions requirements/celery44.txt
View file

This file was deleted.

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

This file was deleted.

6 changes: 3 additions & 3 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#
# make upgrade
#
distlib==0.3.6
distlib==0.3.7
# via virtualenv
filelock==3.12.2
# via
# tox
# virtualenv
packaging==23.1
# via tox
platformdirs==3.8.1
platformdirs==3.9.1
# via virtualenv
pluggy==1.2.0
# via tox
Expand All @@ -29,5 +29,5 @@ tox==3.28.0
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
virtualenv==20.23.1
virtualenv==20.24.1
# via tox
18 changes: 9 additions & 9 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ celery==5.3.1
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
click==8.1.4
click==8.1.6
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -63,7 +63,7 @@ click-repl==0.3.0
# via
# -r requirements/test.txt
# celery
code-annotations==1.3.0
code-annotations==1.5.0
# via
# -r requirements/quality.txt
# edx-lint
Expand All @@ -75,7 +75,7 @@ dill==0.3.6
# via
# -r requirements/quality.txt
# pylint
distlib==0.3.6
distlib==0.3.7
# via
# -r requirements/ci.txt
# virtualenv
Expand All @@ -93,7 +93,7 @@ djangorestframework==3.14.0
# via
# -r requirements/test.txt
# drf-yasg
drf-yasg==1.21.6
drf-yasg==1.21.7
# via -r requirements/test.txt
edx-i18n-tools==1.0.0
# via -r requirements/dev.in
Expand Down Expand Up @@ -142,7 +142,7 @@ mccabe==0.7.0
# via
# -r requirements/quality.txt
# pylint
mock==5.0.2
mock==5.1.0
# via -r requirements/test.txt
packaging==23.1
# via
Expand All @@ -159,9 +159,9 @@ pbr==5.11.1
# via
# -r requirements/quality.txt
# stevedore
pip-tools==6.14.0
pip-tools==7.1.0
# via -r requirements/pip-tools.txt
platformdirs==3.8.1
platformdirs==3.9.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -317,15 +317,15 @@ vine==5.0.0
# amqp
# celery
# kombu
virtualenv==20.23.1
virtualenv==20.24.1
# via
# -r requirements/ci.txt
# tox
wcwidth==0.2.6
# via
# -r requirements/test.txt
# prompt-toolkit
wheel==0.40.0
wheel==0.41.0
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down
20 changes: 10 additions & 10 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ celery==5.3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
certifi==2023.5.7
certifi==2023.7.22
# via requests
cffi==1.15.1
# via cryptography
charset-normalizer==3.2.0
# via requests
click==8.1.4
click==8.1.6
# via
# -r requirements/base.txt
# celery
Expand All @@ -74,7 +74,7 @@ coreapi==2.3.3
# openapi-codec
coreschema==0.0.4
# via coreapi
cryptography==41.0.1
cryptography==41.0.2
# via secretstorage
django==3.2.20
# via
Expand All @@ -101,7 +101,7 @@ docutils==0.19
# readme-renderer
# restructuredtext-lint
# sphinx
drf-yasg==1.21.6
drf-yasg==1.21.7
# via -r requirements/base.txt
idna==3.4
# via requests
Expand Down Expand Up @@ -134,9 +134,9 @@ jinja2==3.1.2
# coreschema
# sphinx
# swagger2rst
jsonschema==4.18.0
jsonschema==4.18.4
# via swagger2rst
jsonschema-specifications==2023.6.1
jsonschema-specifications==2023.7.1
# via jsonschema
keyring==24.2.0
# via twine
Expand Down Expand Up @@ -201,7 +201,7 @@ pyyaml==5.4.1
# swagger2rst
readme-renderer==40.0
# via twine
referencing==0.29.1
referencing==0.30.0
# via
# jsonschema
# jsonschema-specifications
Expand All @@ -219,7 +219,7 @@ rfc3986==2.0.0
# via twine
rich==13.4.2
# via twine
rpds-py==0.8.10
rpds-py==0.9.2
# via
# jsonschema
# referencing
Expand Down Expand Up @@ -288,7 +288,7 @@ uritemplate==4.1.1
# -r requirements/base.txt
# coreapi
# drf-yasg
urllib3==2.0.3
urllib3==2.0.4
# via
# requests
# twine
Expand All @@ -304,7 +304,7 @@ wcwidth==0.2.6
# prompt-toolkit
webencodings==0.5.1
# via bleach
zipp==3.16.0
zipp==3.16.2
# via
# importlib-metadata
# importlib-resources
6 changes: 3 additions & 3 deletions requirements/pip-tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
#
build==0.10.0
# via pip-tools
click==8.1.4
click==8.1.6
# via pip-tools
packaging==23.1
# via build
pip-tools==6.14.0
pip-tools==7.1.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via
# build
# pip-tools
wheel==0.40.0
wheel==0.41.0
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.40.0
wheel==0.41.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.1.2
pip==23.2.1
# via -r requirements/pip.in
setuptools==68.0.0
# via -r requirements/pip.in
6 changes: 3 additions & 3 deletions requirements/quality.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ astroid==2.15.6
# via
# pylint
# pylint-celery
click==8.1.4
click==8.1.6
# via
# click-log
# code-annotations
# edx-lint
click-log==0.4.0
# via edx-lint
code-annotations==1.3.0
code-annotations==1.5.0
# via edx-lint
dill==0.3.6
# via pylint
Expand All @@ -35,7 +35,7 @@ mccabe==0.7.0
# via pylint
pbr==5.11.1
# via stevedore
platformdirs==3.8.1
platformdirs==3.9.1
# via pylint
pycodestyle==2.10.0
# via -r requirements/quality.in
Expand Down
Loading

0 comments on commit 4ada2b7

Please sign in to comment.