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

Switch to Django 4.2 #297

Merged
merged 3 commits into from
Nov 20, 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
2 changes: 0 additions & 2 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
# https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n
USE_I18N = True
# https://docs.djangoproject.com/en/dev/ref/settings/#use-l10n
USE_L10N = True
# https://docs.djangoproject.com/en/dev/ref/settings/#use-tz
USE_TZ = True
# https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths
LOCALE_PATHS = [str(ROOT_DIR / "locale")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>Invalidate Agreement {{ object }}</h2>
<p>This will change the status of all "Active" agreements associated with this version to "Lapsed". </p>

<form method="POST">{% csrf_token %}
{{ form }}
{{ form.as_div }}
<input type="submit" class="btn btn-danger" value="Yes, invalidate"/>
<a href="{{ object.get_absolute_url }}" class="btn btn-secondary" role="button">
No, cancel</a>
Expand Down
17 changes: 12 additions & 5 deletions requirements/dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile dev-requirements.in
# pip-compile requirements/dev-requirements.in
#
alabaster==0.7.13
# via sphinx
asgiref==3.5.2
appnope==0.1.3
# via ipython
asgiref==3.7.2
# via
# -c requirements/requirements.txt
# django
Expand All @@ -18,6 +20,10 @@ babel==2.13.1
# via sphinx
backcall==0.2.0
# via ipython
backports-zoneinfo==0.2.1
# via
# -c requirements/requirements.txt
# django
black==22.12.0
# via -r requirements/dev-requirements.in
certifi==2023.11.17
Expand Down Expand Up @@ -47,7 +53,7 @@ dill==0.3.7
# via pylint
distlib==0.3.7
# via virtualenv
django==3.2.23
django==4.2.7
# via
# -c requirements/requirements.txt
# django-debug-toolbar
Expand Down Expand Up @@ -171,7 +177,6 @@ pytz==2023.3.post1
# via
# -c requirements/requirements.txt
# babel
# django
pyyaml==6.0.1
# via pre-commit
requests==2.31.0
Expand Down Expand Up @@ -245,9 +250,11 @@ types-requests==2.31.0.6
# via -r requirements/dev-requirements.in
types-urllib3==1.26.25.14
# via types-requests
typing-extensions==4.3.0
typing-extensions==4.8.0
# via
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# asgiref
# astroid
# black
# django-stubs
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ oauthlib # https://github.com/oauthlib/oauthlib

# Django
# ------------------------------------------------------------------------------
django>=3.2,<4.0 # pyup: < 3.3 # https://www.djangoproject.com/
django>=4.2,<5.0 # https://www.djangoproject.com/
django-environ # https://github.com/joke2k/django-environ
django-maintenance-mode # https://github.com/fabiocaccamo/django-maintenance-mode
django-model-utils # https://github.com/jazzband/django-model-utils
Expand Down
11 changes: 7 additions & 4 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements.in
# pip-compile requirements/requirements.in
#
argon2-cffi==21.3.0
# via -r requirements/requirements.in
argon2-cffi-bindings==21.2.0
# via argon2-cffi
asgiref==3.5.2
asgiref==3.7.2
# via django
async-timeout==4.0.2
# via redis
attrs==22.1.0
# via jsonschema
backports-zoneinfo==0.2.1
# via django
build==1.0.3
# via pip-tools
cachetools==5.2.0
Expand All @@ -38,7 +40,7 @@ cryptography==41.0.4
# via pyjwt
defusedxml==0.7.1
# via python3-openid
django==3.2.23
django==4.2.7
# via
# -r requirements/requirements.in
# crispy-bootstrap5
Expand Down Expand Up @@ -164,7 +166,6 @@ python3-openid==3.2.0
pytz==2023.3.post1
# via
# -r requirements/requirements.in
# django
# django-anvil-consortium-manager
# django-dbbackup
# pandas
Expand Down Expand Up @@ -201,6 +202,8 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.8.0
# via asgiref
urllib3==2.1.0
# via
# -r requirements/requirements.in
Expand Down
8 changes: 5 additions & 3 deletions requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile test-requirements.in
# pip-compile requirements/test-requirements.in
#
attrs==22.1.0
# via
Expand Down Expand Up @@ -80,8 +80,10 @@ tomli==2.0.1
# via
# -c requirements/requirements.txt
# pytest
typing-extensions==4.3.0
# via django-test-migrations
typing-extensions==4.8.0
# via
# -c requirements/requirements.txt
# django-test-migrations
urllib3==2.1.0
# via
# -c requirements/requirements.txt
Expand Down