diff --git a/config/settings/base.py b/config/settings/base.py index a13b716..8f5b035 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -325,7 +325,9 @@ # Static files (CSS, JavaScript, Images) STATIC_URL = "/staticfiles/" STATIC_ROOT = os.getenv("CORGI_STATIC_FILES_DIR", str(BASE_DIR / "staticfiles")) -STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage" +STORAGES = { + "staticfiles": {"BACKEND": "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"} +} # Celery config CELERY_BROKER_URL = os.getenv("CORGI_REDIS_URL", "redis://redis:6379") diff --git a/requirements/base.in b/requirements/base.in index fffb660..9d1e09f 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,6 +1,6 @@ celery[redis] celery-singleton -django +django==4.2.* # LTS version django-celery-beat django-celery-results django-csp diff --git a/requirements/base.txt b/requirements/base.txt index 29379da..c5ecf2a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,9 +8,9 @@ amqp==5.0.9 \ --hash=sha256:1e5f707424e544078ca196e72ae6a14887ce74e02bd126be54b7c03c971bef18 \ --hash=sha256:9cd81f7b023fc04bbb108718fbac674f06901b77bfcdce85b10e2a5d0ee91be5 # via kombu -asgiref==3.4.1 \ - --hash=sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9 \ - --hash=sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214 +asgiref==3.8.1 \ + --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \ + --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590 # via django attrs==22.1.0 \ --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ @@ -77,9 +77,9 @@ decorator==5.1.0 \ --hash=sha256:7b12e7c3c6ab203a29e157335e9122cb03de9ab7264b137594103fd4a683b374 \ --hash=sha256:e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7 # via gssapi -django==3.2.24 \ - --hash=sha256:5dd5b787c3ba39637610fe700f54bf158e33560ea0dba600c19921e7ff926ec5 \ - --hash=sha256:aaee9fb0fb4ebd4311520887ad2e33313d368846607f82a9a0ed461cd4c35b18 +django==4.2.11 \ + --hash=sha256:6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4 \ + --hash=sha256:ddc24a0a8280a0430baa37aff11f28574720af05888c62b7cfe71d219f4599d3 # via # -r requirements/base.in # django-celery-beat @@ -383,7 +383,6 @@ pytz==2021.3 \ --hash=sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 # via # celery - # django # djangorestframework # flower pyyaml==6.0 \ diff --git a/requirements/dev.txt b/requirements/dev.txt index d39a570..7d9149a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -11,9 +11,9 @@ amqp==5.0.9 \ # -r requirements/base.txt # -r requirements/test.txt # kombu -asgiref==3.4.1 \ - --hash=sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9 \ - --hash=sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214 +asgiref==3.8.1 \ + --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \ + --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590 # via # -r requirements/base.txt # -r requirements/test.txt @@ -338,9 +338,9 @@ distlib==0.3.8 \ --hash=sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 \ --hash=sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64 # via virtualenv -django==3.2.24 \ - --hash=sha256:5dd5b787c3ba39637610fe700f54bf158e33560ea0dba600c19921e7ff926ec5 \ - --hash=sha256:aaee9fb0fb4ebd4311520887ad2e33313d368846607f82a9a0ed461cd4c35b18 +django==4.2.11 \ + --hash=sha256:6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4 \ + --hash=sha256:ddc24a0a8280a0430baa37aff11f28574720af05888c62b7cfe71d219f4599d3 # via # -r requirements/base.txt # -r requirements/test.txt @@ -1046,7 +1046,6 @@ pytz==2021.3 \ # -r requirements/base.txt # -r requirements/test.txt # celery - # django # djangorestframework # flower pyyaml==6.0 \ diff --git a/requirements/test.txt b/requirements/test.txt index 2ac0f6b..4488a18 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -10,9 +10,9 @@ amqp==5.0.9 \ # via # -r requirements/base.txt # kombu -asgiref==3.4.1 \ - --hash=sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9 \ - --hash=sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214 +asgiref==3.8.1 \ + --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \ + --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590 # via # -r requirements/base.txt # django @@ -253,9 +253,9 @@ decorator==5.1.0 \ # via # -r requirements/base.txt # gssapi -django==3.2.24 \ - --hash=sha256:5dd5b787c3ba39637610fe700f54bf158e33560ea0dba600c19921e7ff926ec5 \ - --hash=sha256:aaee9fb0fb4ebd4311520887ad2e33313d368846607f82a9a0ed461cd4c35b18 +django==4.2.11 \ + --hash=sha256:6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4 \ + --hash=sha256:ddc24a0a8280a0430baa37aff11f28574720af05888c62b7cfe71d219f4599d3 # via # -r requirements/base.txt # django-celery-beat @@ -778,7 +778,6 @@ pytz==2021.3 \ # via # -r requirements/base.txt # celery - # django # djangorestframework # flower pyyaml==6.0 \