From eb74bd47fb596a3e9fe0a2c095852fbbcee237a2 Mon Sep 17 00:00:00 2001 From: Rechner Fox <659028+rechner@users.noreply.github.com> Date: Wed, 28 Feb 2024 18:36:40 -0800 Subject: [PATCH] Fix U2F sub-dependency (#315) * Fix U2F subdependencies in fork * Minor changes rattling around in my branch --- Dockerfile | 2 +- fm_eventmanager/settings.py.docker | 2 +- registration/tests/test_templates.py | 9 +++++++++ requirements.txt | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 registration/tests/test_templates.py diff --git a/Dockerfile b/Dockerfile index d9c394a1..04d4590d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/furthemore/apis:apis-base-3ba493b +FROM ghcr.io/furthemore/apis:apis-base-11fb148 LABEL org.opencontainers.image.source="https://github.com/furthemore/APIS" diff --git a/fm_eventmanager/settings.py.docker b/fm_eventmanager/settings.py.docker index baa24b4b..b91a4123 100644 --- a/fm_eventmanager/settings.py.docker +++ b/fm_eventmanager/settings.py.docker @@ -122,12 +122,12 @@ INSTALLED_APPS = [ 'django.contrib.sites', 'widget_tweaks', 'mathfilters', - 'nested_inline', 'import_export', 'django_extensions', 'django_u2f', 'maintenance_mode', 'registration', + 'nested_inline', 'debug_toolbar', 'django_prometheus', ] diff --git a/registration/tests/test_templates.py b/registration/tests/test_templates.py new file mode 100644 index 00000000..97504233 --- /dev/null +++ b/registration/tests/test_templates.py @@ -0,0 +1,9 @@ +import unittest + +from django.core.management import call_command + + +class TestTemplates(unittest.TestCase): + def test_validate_templates(self): + call_command("validate_templates") + # This throws an error if it fails to validate diff --git a/requirements.txt b/requirements.txt index 41a8268e..8824d9a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ django-nested-inline~=0.4.6 django-prometheus~=2.3.1 django-redis~=5.4.0 #django-u2f~=1.0.1 -git+https://github.com/gavinwahl/django-u2f.git@34410af +git+https://github.com/rechner/django-u2f.git@23022f8 django-widget-tweaks==1.5.0 freezegun==1.4.0 influxdb~=5.3.1 # Influx < v1.7