From 87ab466daeb0ff5002fda87e68810c0f26f52ce9 Mon Sep 17 00:00:00 2001 From: Johanna England Date: Fri, 15 Nov 2024 13:46:49 +0100 Subject: [PATCH 1/5] Change comments about forms to not say they are using crispy --- python/nav/web/crispyforms.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/python/nav/web/crispyforms.py b/python/nav/web/crispyforms.py index dcc6a36e1f..4669ba9775 100644 --- a/python/nav/web/crispyforms.py +++ b/python/nav/web/crispyforms.py @@ -13,7 +13,7 @@ # more details. You should have received a copy of the GNU General Public # License along with NAV. If not, see . # -"""A collection of forms using the django crispy forms framework""" +"""A collection of forms inspired by the django crispy forms framework""" from types import SimpleNamespace from typing import Optional @@ -56,9 +56,6 @@ class NumberField(forms.IntegerField): widget = NumberInput -# For uncrispyfied forms: - - class FlatFieldset: """A class representing a fieldset for forms. Only flat layout of children fields is supported out of the box. From 32a7b8ca6522ec1cddd27579ba71b2d49ec119cd Mon Sep 17 00:00:00 2001 From: Johanna England Date: Fri, 15 Nov 2024 13:47:07 +0100 Subject: [PATCH 2/5] Remove crispyforms from INSTALLED_APPS --- python/nav/django/settings.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/nav/django/settings.py b/python/nav/django/settings.py index 8738265df4..b1bc816e76 100644 --- a/python/nav/django/settings.py +++ b/python/nav/django/settings.py @@ -222,8 +222,6 @@ 'django.contrib.sessions', 'django.contrib.humanize', 'django_filters', - 'crispy_forms', - 'crispy_forms_foundation', 'rest_framework', 'nav.auditlog', 'nav.web.macwatch', From 9b7e818a900d7da12b65a8382d2930a507051f59 Mon Sep 17 00:00:00 2001 From: Johanna England Date: Fri, 15 Nov 2024 13:47:32 +0100 Subject: [PATCH 3/5] Remove crispy-forms(-foundation) from requirements --- requirements/base.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index ab11756046..91b855dbc3 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -24,8 +24,6 @@ dnspython<3.0.0,>=2.1.0 django-filter>=2 djangorestframework>=3.12,<3.13 -django-crispy-forms>=1.8,<1.9 -crispy-forms-foundation>=0.7,<0.8 # REST framework iso8601 From df9d9164c73e53959bbb87b4b5a691079f9dd71c Mon Sep 17 00:00:00 2001 From: Johanna England Date: Tue, 19 Nov 2024 12:29:00 +0100 Subject: [PATCH 4/5] Remove crispy settings --- python/nav/django/settings.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/nav/django/settings.py b/python/nav/django/settings.py index b1bc816e76..75fa799054 100644 --- a/python/nav/django/settings.py +++ b/python/nav/django/settings.py @@ -211,8 +211,6 @@ 'nav.web.navlets.env_rack.EnvironmentRackWidget', ) -CRISPY_ALLOWED_TEMPLATE_PACKS = 'foundation-5' -CRISPY_TEMPLATE_PACK = 'foundation-5' INSTALLED_APPS = ( 'nav.models', From 05a665198f36684092ea28160a24d7144fb52bc9 Mon Sep 17 00:00:00 2001 From: Johanna England Date: Fri, 15 Nov 2024 14:44:51 +0100 Subject: [PATCH 5/5] Add news fragment and notes --- NOTES.rst | 12 ++++++++++++ changelog.d/2794.removed.md | 1 + 2 files changed, 13 insertions(+) create mode 100644 changelog.d/2794.removed.md diff --git a/NOTES.rst b/NOTES.rst index 37a1963a06..8e92555b46 100644 --- a/NOTES.rst +++ b/NOTES.rst @@ -8,6 +8,18 @@ existing bug reports, go to https://github.com/uninett/nav/issues . To see an overview of upcoming release milestones and the issues they resolve, please go to https://github.com/uninett/nav/milestones . +Unreleased +========== + +Dependency changes +------------------ + +These Python modules are no longer required due to us rewriting forms in order +to be able to upgrade to Python 3.11: + +* :mod:`django-crispy-forms` +* :mod:`crispy-forms-foundation` + NAV 5.11 ======== diff --git a/changelog.d/2794.removed.md b/changelog.d/2794.removed.md new file mode 100644 index 0000000000..cbf53deff7 --- /dev/null +++ b/changelog.d/2794.removed.md @@ -0,0 +1 @@ +Removed dependencies django-crispy-forms and crispy-forms-foundation