Skip to content
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
2 changes: 1 addition & 1 deletion projects/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@

MIDDLEWARE = [
"debug_toolbar.middleware.DebugToolbarMiddleware",

"django.middleware.security.SecurityMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",

# Admin-specific
"django.contrib.admindocs.middleware.XViewMiddleware",
]
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Core requirements for using this application
-c constraints.txt

Django<4.0 # Web application framework
Django<5.0 # Web application framework

djangorestframework<4.0 # REST API
5 changes: 3 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
#
asgiref==3.6.0
# via django
django==3.2.18
django==3.2.19
# via
# -c requirements/constraints.txt
# -r requirements/base.in
# djangorestframework
djangorestframework==3.14.0
Expand All @@ -16,5 +17,5 @@ pytz==2023.3
# via
# django
# djangorestframework
sqlparse==0.4.3
sqlparse==0.4.4
# via django
35 changes: 14 additions & 21 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,41 @@
#
# make upgrade
#
cachetools==5.3.0
# via tox
chardet==5.1.0
# via tox
click==8.1.3
# via import-linter
colorama==0.4.6
# via tox
coverage==7.2.3
coverage==7.2.5
# via -r requirements/ci.in
distlib==0.3.6
# via virtualenv
filelock==3.11.0
filelock==3.12.0
# via
# tox
# virtualenv
grimp==2.3
grimp==2.4
# via import-linter
import-linter==1.8.0
# via -r requirements/ci.in
packaging==23.1
# via
# pyproject-api
# tox
platformdirs==3.2.0
# via
# tox
# virtualenv
# via tox
platformdirs==3.5.1
# via virtualenv
pluggy==1.0.0
# via tox
pyproject-api==1.5.1
py==1.11.0
# via tox
six==1.16.0
# via tox
tomli==2.0.1
# via
# import-linter
# pyproject-api
# tox
tox==4.4.12
# via -r requirements/ci.in
tox==3.28.0
# via
# -c requirements/constraints.txt
# -r requirements/ci.in
typing-extensions==4.5.0
# via
# grimp
# import-linter
virtualenv==20.21.0
virtualenv==20.23.0
# via tox
5 changes: 4 additions & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@

# 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
tox<4.0.0

# Develop primarily on Django 3.2, but we'll want to start testing against 4.2
Django<4.0
1 change: 1 addition & 0 deletions requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
diff-cover # Changeset diff test coverage
edx-i18n-tools # For i18n_tool dummy
tox-battery # Makes tox aware of requirements file changes
django-debug-toolbar # Debugging DB queries primarily
72 changes: 33 additions & 39 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ asgiref==3.6.0
# via
# -r requirements/quality.txt
# django
astroid==2.15.2
astroid==2.15.4
# via
# -r requirements/quality.txt
# pylint
Expand All @@ -21,19 +21,12 @@ build==0.10.0
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.3.0
# via
# -r requirements/ci.txt
# tox
certifi==2022.12.7
certifi==2023.5.7
# via
# -r requirements/quality.txt
# requests
chardet==5.1.0
# via
# -r requirements/ci.txt
# diff-cover
# tox
# via diff-cover
charset-normalizer==3.1.0
# via
# -r requirements/quality.txt
Expand All @@ -56,11 +49,7 @@ code-annotations==1.3.0
# via
# -r requirements/quality.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.2.3
coverage[toml]==7.2.5
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -75,14 +64,18 @@ distlib==0.3.6
# via
# -r requirements/ci.txt
# virtualenv
django==3.2.18
django==3.2.19
# via
# -c requirements/constraints.txt
# -r requirements/quality.txt
# django-debug-toolbar
# djangorestframework
# edx-i18n-tools
django-debug-toolbar==4.0.0
# via -r requirements/dev.in
djangorestframework==3.14.0
# via -r requirements/quality.txt
docutils==0.19
docutils==0.20
# via
# -r requirements/quality.txt
# readme-renderer
Expand All @@ -94,12 +87,12 @@ exceptiongroup==1.1.1
# via
# -r requirements/quality.txt
# pytest
filelock==3.11.0
filelock==3.12.0
# via
# -r requirements/ci.txt
# tox
# virtualenv
grimp==2.3
grimp==2.4
# via
# -r requirements/ci.txt
# import-linter
Expand All @@ -109,7 +102,7 @@ idna==3.4
# requests
import-linter==1.8.0
# via -r requirements/ci.txt
importlib-metadata==6.3.0
importlib-metadata==6.6.0
# via
# -r requirements/quality.txt
# keyring
Expand Down Expand Up @@ -169,7 +162,6 @@ packaging==23.1
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# pyproject-api
# pytest
# tox
path==16.6.0
Expand All @@ -184,12 +176,11 @@ pkginfo==1.9.6
# via
# -r requirements/quality.txt
# twine
platformdirs==3.2.0
platformdirs==3.5.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pylint
# tox
# virtualenv
pluggy==1.0.0
# via
Expand All @@ -200,17 +191,21 @@ pluggy==1.0.0
# tox
polib==1.2.0
# via edx-i18n-tools
py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.10.0
# via -r requirements/quality.txt
pydocstyle==6.3.0
# via -r requirements/quality.txt
pygments==2.15.0
pygments==2.15.1
# via
# -r requirements/quality.txt
# diff-cover
# readme-renderer
# rich
pylint==2.17.2
pylint==2.17.4
# via
# -r requirements/quality.txt
# edx-lint
Expand All @@ -230,15 +225,11 @@ pylint-plugin-utils==0.7
# -r requirements/quality.txt
# pylint-celery
# pylint-django
pyproject-api==1.5.1
# via
# -r requirements/ci.txt
# tox
pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
# build
pytest==7.3.0
pytest==7.3.1
# via
# -r requirements/quality.txt
# pytest-cov
Expand All @@ -265,36 +256,39 @@ readme-renderer==37.3
# via
# -r requirements/quality.txt
# twine
requests==2.28.2
requests==2.30.0
# via
# -r requirements/quality.txt
# requests-toolbelt
# twine
requests-toolbelt==0.10.1
requests-toolbelt==1.0.0
# via
# -r requirements/quality.txt
# twine
rfc3986==2.0.0
# via
# -r requirements/quality.txt
# twine
rich==13.3.4
rich==13.3.5
# via
# -r requirements/quality.txt
# twine
six==1.16.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# bleach
# edx-lint
# tox
snowballstemmer==2.2.0
# via
# -r requirements/quality.txt
# pydocstyle
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -r requirements/quality.txt
# django
# django-debug-toolbar
stevedore==5.0.0
# via
# -r requirements/quality.txt
Expand All @@ -312,16 +306,16 @@ tomli==2.0.1
# coverage
# import-linter
# pylint
# pyproject-api
# pyproject-hooks
# pytest
# tox
tomlkit==0.11.7
tomlkit==0.11.8
# via
# -r requirements/quality.txt
# pylint
tox==4.4.12
tox==3.28.0
# via
# -c requirements/constraints.txt
# -r requirements/ci.txt
# tox-battery
tox-battery==0.6.1
Expand All @@ -337,12 +331,12 @@ typing-extensions==4.5.0
# import-linter
# pylint
# rich
urllib3==1.26.15
urllib3==2.0.2
# via
# -r requirements/quality.txt
# requests
# twine
virtualenv==20.21.0
virtualenv==20.23.0
# via
# -r requirements/ci.txt
# tox
Expand Down
Loading