From 755df50c41a0b321e24e60e03b16ae51746654a8 Mon Sep 17 00:00:00 2001 From: Markos Gogoulos Date: Mon, 16 Aug 2021 23:46:25 +0300 Subject: [PATCH] pin Django 3.1.12 (#260) * pin Django 3.1.12, this requires to remove absolute paths for upload dirs --- cms/settings.py | 11 +++++++---- requirements.txt | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cms/settings.py b/cms/settings.py index fa07a5d..e0c0b52 100644 --- a/cms/settings.py +++ b/cms/settings.py @@ -146,10 +146,13 @@ STATIC_ROOT = BASE_DIR + "/static/" # 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 index 58ac65d..326c293 100644 --- 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 \ No newline at end of file +django-login-required-middleware==0.6.1