From e05aa67b451fddd12221883b40f21f470ecfbbfb Mon Sep 17 00:00:00 2001 From: Smirnova Maria Date: Tue, 29 Jun 2021 22:31:03 +0300 Subject: [PATCH 1/2] Update to Django 3.1.12. --- cvat/apps/engine/models.py | 4 ++-- cvat/requirements/base.txt | 2 +- cvat/settings/testing.py | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index cbcc5f2df8a..2864776a05c 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -275,7 +275,7 @@ def get_available_name(self, name, max_length=None): return name def upload_path_handler(instance, filename): - return os.path.join(instance.data.get_upload_dirname(), filename) + return os.path.join(os.path.relpath(instance.data.get_upload_dirname(), settings.BASE_DIR), filename) # For client files which the user is uploaded class ClientFile(models.Model): @@ -612,4 +612,4 @@ def get_specific_attributes(self): return { item.split('=')[0].strip(): item.split('=')[1].strip() for item in specific_attributes.split('&') - } if specific_attributes else dict() \ No newline at end of file + } if specific_attributes else dict() diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt index a0433b1d353..ad9de267776 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -1,5 +1,5 @@ click==7.1.2 -Django==3.1.10 +Django==3.1.12 django-appconf==1.0.4 django-auth-ldap==2.2.0 django-cacheops==5.0.1 diff --git a/cvat/settings/testing.py b/cvat/settings/testing.py index e79b0f395df..992ba8666da 100644 --- a/cvat/settings/testing.py +++ b/cvat/settings/testing.py @@ -5,12 +5,13 @@ from .development import * import tempfile -_temp_dir = tempfile.TemporaryDirectory(suffix="cvat") +_temp_dir = tempfile.TemporaryDirectory(dir=BASE_DIR, suffix="cvat") +BASE_DIR = _temp_dir.name -DATA_ROOT = os.path.join(_temp_dir.name, 'data') +DATA_ROOT = os.path.join(BASE_DIR, 'data') os.makedirs(DATA_ROOT, exist_ok=True) -SHARE_ROOT = os.path.join(_temp_dir.name, 'share') +SHARE_ROOT = os.path.join(BASE_DIR, 'share') os.makedirs(SHARE_ROOT, exist_ok=True) MEDIA_DATA_ROOT = os.path.join(DATA_ROOT, 'data') @@ -30,7 +31,7 @@ # To avoid ERROR django.security.SuspiciousFileOperation: # The joined path (...) is located outside of the base path component -MEDIA_ROOT = _temp_dir.name +MEDIA_ROOT = BASE_DIR # Suppress all logs by default for logger in LOGGING["loggers"].values(): From 10980a10253be1144ce95a0a2cc5078f7fa5ace3 Mon Sep 17 00:00:00 2001 From: Smirnova Maria Date: Wed, 30 Jun 2021 10:23:32 +0300 Subject: [PATCH 2/2] Update changelog and add comment. --- CHANGELOG.md | 1 + cvat/apps/engine/models.py | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c512e0afb67..98964a61b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated manifest format, added meta with related images () - Update of COCO format documentation () - Updated Webpack Dev Server config to add proxxy () +- Update to Django 3.1.12 () ### Deprecated diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index 2864776a05c..78ec751abd2 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -275,6 +275,7 @@ def get_available_name(self, name, max_length=None): return name def upload_path_handler(instance, filename): + # relative path is required since Django 3.1.11 return os.path.join(os.path.relpath(instance.data.get_upload_dirname(), settings.BASE_DIR), filename) # For client files which the user is uploaded