Skip to content

Commit

Permalink
Merge pull request #152 from openedx/zshkoor/django42
Browse files Browse the repository at this point in the history 
feat: upgrade to Django 4.2
  • Loading branch information
@zubairshakoorarbisoft
zubairshakoorarbisoft authored Jul 21, 2023
2 parents e5d0068 + c0786a9 commit 9101f41
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [py38-django32, quality]
toxenv: [py38-django32, py38-django42, quality]

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

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django32'
if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django42'
uses: codecov/codecov-action@v3
with:
flags: unittests
Expand Down
3 changes: 3 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
pip-compile --upgrade -o requirements/tox.txt requirements/tox.in
pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
pip-compile --upgrade -o requirements/docs.txt requirements/docs.in
# lets tox controls the django versions.
sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
rm requirements/test.txt.tmp

.PHONY: requirements
requirements: ## install development environment requirements
Expand Down
2 changes: 1 addition & 1 deletion done/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

from .done import DoneXBlock

__version__ = '2.0.5'
__version__ = '2.1.0'
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pytz==2023.3
# via
# django
# xblock
pyyaml==6.0
pyyaml==6.0.1
# via xblock
simplejson==3.19.1
# via xblock-utils
Expand Down
14 changes: 7 additions & 7 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ bleach==6.0.0
# via
# -r requirements/test.txt
# readme-renderer
boto3==1.28.3
boto3==1.28.8
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.31.3
botocore==1.31.8
# via
# -r requirements/test.txt
# boto3
Expand All @@ -54,7 +54,7 @@ charset-normalizer==3.2.0
# via
# -r requirements/test.txt
# requests
click==8.1.5
click==8.1.6
# via
# -r requirements/test.txt
# click-log
Expand All @@ -65,7 +65,7 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.3.0
code-annotations==1.5.0
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -89,7 +89,7 @@ dill==0.3.6
# via
# -r requirements/test.txt
# pylint
distlib==0.3.6
distlib==0.3.7
# via
# -r requirements/tox.txt
# virtualenv
Expand Down Expand Up @@ -297,7 +297,7 @@ pytz==2023.3
# -r requirements/test.txt
# django
# xblock
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/test.txt
# code-annotations
Expand Down Expand Up @@ -392,7 +392,7 @@ urllib3==1.26.16
# botocore
# requests
# twine
virtualenv==20.24.0
virtualenv==20.24.1
# via
# -r requirements/tox.txt
# tox
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pytz==2023.3
# -r requirements/base.txt
# django
# xblock
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# edx-i18n-tools
Expand Down
4 changes: 2 additions & 2 deletions requirements/docs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pytz==2023.3
# babel
# django
# xblock
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# xblock
Expand Down Expand Up @@ -126,7 +126,7 @@ typing-extensions==4.7.1
# -r requirements/base.txt
# asgiref
# pydata-sphinx-theme
urllib3==2.0.3
urllib3==2.0.4
# via requests
web-fragments==2.0.0
# via
Expand Down
5 changes: 3 additions & 2 deletions requirements/pip-tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@
#
build==0.10.0
# via pip-tools
click==8.1.5
click==8.1.6
# via pip-tools
packaging==23.1
# via build
pip-tools==7.0.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
# pyproject-hooks
wheel==0.40.0
# via pip-tools

Expand Down
10 changes: 5 additions & 5 deletions requirements/quality.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ astroid==2.15.6
# pylint-celery
binaryornot==0.4.4
# via cookiecutter
boto3==1.28.3
boto3==1.28.8
# via fs-s3fs
botocore==1.31.3
botocore==1.31.8
# via
# boto3
# s3transfer
Expand All @@ -32,15 +32,15 @@ chardet==5.1.0
# via binaryornot
charset-normalizer==3.2.0
# via requests
click==8.1.5
click==8.1.6
# via
# click-log
# code-annotations
# cookiecutter
# edx-lint
click-log==0.4.0
# via edx-lint
code-annotations==1.3.0
code-annotations==1.5.0
# via edx-lint
cookiecutter==2.2.3
# via xblock-sdk
Expand Down Expand Up @@ -139,7 +139,7 @@ pytz==2023.3
# -r requirements/base.txt
# django
# xblock
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# code-annotations
Expand Down
11 changes: 5 additions & 6 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ binaryornot==0.4.4
# via cookiecutter
bleach==6.0.0
# via readme-renderer
boto3==1.28.3
boto3==1.28.8
# via fs-s3fs
botocore==1.31.3
botocore==1.31.8
# via
# boto3
# s3transfer
Expand All @@ -36,15 +36,15 @@ chardet==5.1.0
# via binaryornot
charset-normalizer==3.2.0
# via requests
click==8.1.5
click==8.1.6
# via
# click-log
# code-annotations
# cookiecutter
# edx-lint
click-log==0.4.0
# via edx-lint
code-annotations==1.3.0
code-annotations==1.5.0
# via edx-lint
cookiecutter==2.2.3
# via xblock-sdk
Expand All @@ -58,7 +58,6 @@ ddt==1.6.0
# via -r requirements/test.in
dill==0.3.6
# via pylint
django==3.2.20
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -188,7 +187,7 @@ pytz==2023.3
# -r requirements/base.txt
# django
# xblock
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# code-annotations
Expand Down
4 changes: 2 additions & 2 deletions requirements/tox.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
distlib==0.3.6
distlib==0.3.7
# via virtualenv
filelock==3.12.2
# via
Expand All @@ -26,5 +26,5 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/tox.in
virtualenv==20.24.0
virtualenv==20.24.1
# via tox
4 changes: 2 additions & 2 deletions tox.ini
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[tox]
envlist = py38-django{32}, quality
envlist = py38-django{32, 42}, quality

[testenv]
allowlist_externals =
make
deps =
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
commands =
make test
Expand Down

0 comments on commit 9101f41

Please sign in to comment.