From 516a7f4be57360e917143c35abd7b21996999e6d Mon Sep 17 00:00:00 2001
From: bleizi <bleizi@crans.org>
Date: Wed, 24 Jan 2024 20:14:32 +0100
Subject: [PATCH] Remove importation of django-htcpcp-tea which is not
compatible with django 4.2
---
note_kfet/settings/base.py | 2 +-
note_kfet/urls.py | 8 +++++---
requirements.txt | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py
index f3c23f4d..1e9e0752 100644
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@@ -41,7 +41,7 @@ INSTALLED_APPS = [
'bootstrap_datepicker_plus',
'colorfield',
'crispy_forms',
- 'django_htcpcp_tea',
+# 'django_htcpcp_tea',
'django_tables2',
'mailer',
'phonenumber_field',
diff --git a/note_kfet/urls.py b/note_kfet/urls.py
index 7fc37fa7..72be36ea 100644
--- a/note_kfet/urls.py
+++ b/note_kfet/urls.py
@@ -30,9 +30,6 @@ urlpatterns = [
path('accounts/', include('django.contrib.auth.urls')),
path('api/', include('api.urls')),
path('permission/', include('permission.urls')),
-
- # Make coffee
- path('coffee/', include('django_htcpcp_tea.urls')),
]
# During development, serve static and media files
@@ -57,6 +54,11 @@ if "debug_toolbar" in settings.INSTALLED_APPS:
path('__debug__/', include(debug_toolbar.urls)),
] + urlpatterns
+if "django_htcpcp_tea" in settings.INSTALLED_APPS:
+ # Make coffee
+ urlpatterns.append(
+ path('coffee/', include('django_htcpcp_tea.urls'))
+ )
handler400 = bad_request
handler403 = permission_denied
diff --git a/requirements.txt b/requirements.txt
index 7af89d9f..1750cd66 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ django-colorfield~=0.11.0
django-crispy-forms~=2.1.0
django-extensions>=3.2.3
django-filter~=23.5
-django-htcpcp-tea~=0.8.1
+#django-htcpcp-tea~=0.8.1
django-mailer~=2.3.1
django-oauth-toolkit~=2.3.0
django-phonenumber-field~=7.3.0
--
GitLab