pin Django 3.1.12 (mediacms-io#260)

* pin Django 3.1.12, this requires to remove absolute paths for upload dirs
acklan · Aug 16, 2021 · 755df50 · 755df50
1 parent ba94989
commit 755df50
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/cms/settings.py b/cms/settings.py
@@ -146,10 +146,13 @@
 # where uploaded + encoded media are stored
 MEDIA_ROOT = BASE_DIR + "/media_files/"
 
-MEDIA_UPLOAD_DIR = os.path.join(MEDIA_ROOT, "original/")
-MEDIA_ENCODING_DIR = os.path.join(MEDIA_ROOT, "encoded/")
-THUMBNAIL_UPLOAD_DIR = os.path.join(MEDIA_UPLOAD_DIR, "thumbnails/")
-SUBTITLES_UPLOAD_DIR = os.path.join(MEDIA_UPLOAD_DIR, "subtitles/")
+# these used to be os.path.join(MEDIA_ROOT, "folder/") but update to
+# Django 3.1.9 requires not absolute paths to be utilized...
+
+MEDIA_UPLOAD_DIR = "original/"
+MEDIA_ENCODING_DIR = "encoded/"
+THUMBNAIL_UPLOAD_DIR = f"{MEDIA_UPLOAD_DIR}/thumbnails/"
+SUBTITLES_UPLOAD_DIR = f"{MEDIA_UPLOAD_DIR}/subtitles/"
 HLS_DIR = os.path.join(MEDIA_ROOT, "hls/")
 
 FFMPEG_COMMAND = "ffmpeg"  # this is the path

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Django==3.1.8
+Django==3.1.12
 djangorestframework==3.12.2
 django-allauth==0.44.0
 
@@ -30,4 +30,4 @@ m3u8
 django-ckeditor
 django-debug-toolbar
 
-django-login-required-middleware==0.6.1
+django-login-required-middleware==0.6.1