Merge branch 'cleanup_settings' into 'django3_migration'

Settings cleanup

See merge request !362

beat/web/settings/__init__.py

@@ -28,7 +28,6 @@
 import os
 import platform
 
-
 SHM_PATH = "/dev/shm/beatweb"  # nosec
 
 

beat/web/settings/ci.py

@@ -28,9 +28,9 @@
 # Django settings for tests on the CI server
 import os
 
-from .test import *  # noqa
 from . import get_test_db_path
 from . import get_test_prefix_path
+from .test import *  # noqa
 
 RUNNING_ON_CI = True
 DATABASES["default"]["OPTIONS"]["timeout"] = 60  # noqa

beat/web/settings/nodebug.py

@@ -27,7 +27,7 @@
 
 # Django settings for debugging infrastructure
 
-from .settings import *
+from .settings import *  # noqa: F403
 
-DEBUG             = False
-TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
+DEBUG = False
+TEMPLATES[0]["OPTIONS"]["debug"] = DEBUG  # noqa: F405

beat/web/settings/test.py

@@ -28,9 +28,9 @@
 # Django settings for tests
 import os
 
-from .settings import *  # noqa
 from . import get_test_db_path
 from . import get_test_prefix_path
+from .settings import *  # noqa
 
 URL_PREFIX = ""