improve_settings_and_fix_mypy_errors

Author: Dimitar Todorov

config/django/base.py

@@ -156,13 +156,6 @@
 USE_TZ = True
 
 
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/3.0/howto/static-files/
-
-STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
-STATIC_URL = "/static/"
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
-
 REST_FRAMEWORK = {
     "EXCEPTION_HANDLER": "styleguide_example.api.exception_handlers.drf_default_with_modifications_exception_handler",
     # 'EXCEPTION_HANDLER': 'styleguide_example.api.exception_handlers.hacksoft_proposed_exception_handler',

config/settings/files_and_storages.py

@@ -3,6 +3,19 @@
 from config.env import BASE_DIR, env, env_to_enum
 from styleguide_example.files.enums import FileUploadStorage, FileUploadStrategy
 
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/3.0/howto/static-files/
+STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
+STATIC_URL = "/static/"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {"BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage"},
+}
+
+
 FILE_UPLOAD_STRATEGY = env_to_enum(FileUploadStrategy, env("FILE_UPLOAD_STRATEGY", default="standard"))
 FILE_UPLOAD_STORAGE = env_to_enum(FileUploadStorage, env("FILE_UPLOAD_STORAGE", default="local"))
 
@@ -16,7 +29,7 @@
 if FILE_UPLOAD_STORAGE == FileUploadStorage.S3:
     # Using django-storages
     # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html
-    DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+    STORAGES["default"] = {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage"}
 
     AWS_S3_ACCESS_KEY_ID = env("AWS_S3_ACCESS_KEY_ID")
     AWS_S3_SECRET_ACCESS_KEY = env("AWS_S3_SECRET_ACCESS_KEY")

styleguide_example/common/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.db.models.query import F, Q
+from django.db.models import F, Q
 from django.utils import timezone
 
 

styleguide_example/testing_examples/models.py

@@ -1,7 +1,7 @@
 from uuid import uuid4
 
 from django.db import models
-from django.db.models.query import F, Q
+from django.db.models import F, Q
 
 
 class School(models.Model):

styleguide_example/testing_examples/selectors/schools.py

@@ -2,7 +2,7 @@
 from typing import Optional
 
 from django.core.exceptions import ValidationError
-from django.db.models.query import Q, QuerySet
+from django.db.models import Q, QuerySet
 
 from styleguide_example.testing_examples.models import School, SchoolCourse