From 92915c4f770bd69addcb42b6ff4bda70f26a6c1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 19:51:55 +0000 Subject: [PATCH 1/7] Bump django-sekizai from 4.0.0 to 4.1.0 Bumps [django-sekizai](https://github.com/django-cms/django-sekizai) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/django-cms/django-sekizai/releases) - [Changelog](https://github.com/django-cms/django-sekizai/blob/master/CHANGELOG.rst) - [Commits](https://github.com/django-cms/django-sekizai/compare/4.0.0...4.1.0) --- updated-dependencies: - dependency-name: django-sekizai dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 9 +++++---- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 9141f79..88bfa52 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1705,14 +1705,14 @@ files = [ [[package]] name = "django-sekizai" -version = "4.0.0" +version = "4.1.0" description = "Django Sekizai" category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "django-sekizai-4.0.0.tar.gz", hash = "sha256:3304732a8da09e311df0f851185c9b2d57867126f2c73f00326f57d0ffbc2d68"}, - {file = "django_sekizai-4.0.0-py3-none-any.whl", hash = "sha256:98ec08acf2670d441cf0f57ec0a3623f3e2e1a75a61735dec53162016f041284"}, + {file = "django-sekizai-4.1.0.tar.gz", hash = "sha256:2aca36cbae0b5c0cefed9565416ec442335767fb3145bff11e58622fc653cdad"}, + {file = "django_sekizai-4.1.0-py3-none-any.whl", hash = "sha256:aa12e66ba0335fbe726b7d74cf4e8716b89a0be99a1304a9b9e8b191229e2e4a"}, ] [package.dependencies] @@ -5366,6 +5366,7 @@ category = "main" optional = false python-versions = "*" files = [ + {file = "wcwidth-0.2.6-py2.py3-none-any.whl", hash = "sha256:795b138f6875577cd91bba52baf9e445cd5118fd32723b460e30a0af30ea230e"}, {file = "wcwidth-0.2.6.tar.gz", hash = "sha256:a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0"}, ] @@ -5708,4 +5709,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "2365c910257ce91b09f72d236f19cf15257b5561f7fc746fed7c8e1f6155c0d4" +content-hash = "c62c49bdf43a7513ffab944e0b76b3d62b3e9191c2d238ec6e215cbdeb2653a1" diff --git a/pyproject.toml b/pyproject.toml index 9039857..f22c488 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,7 +64,7 @@ django-cacheops = "^6.1" django-extra-settings = "^0.9.1" psycopg2-binary = "^2.9.5" django-cms = "^3.11.1" -django-sekizai = "^4.0.0" +django-sekizai = "^4.1.0" amzqr = "^0.0.1" django-active-link = "^0.1.8" channels = {extras = ["daphne"], version = "^4.0.0"} From 8fde18edc43dceea0d947e72c54a5a488235c440 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 19:54:36 +0000 Subject: [PATCH 2/7] Bump django from 4.2 to 4.2.1 Bumps [django](https://github.com/django/django) from 4.2 to 4.2.1. - [Commits](https://github.com/django/django/compare/4.2...4.2.1) --- updated-dependencies: - dependency-name: django dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 9141f79..45baa91 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1240,14 +1240,14 @@ files = [ [[package]] name = "django" -version = "4.2" +version = "4.2.1" description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "Django-4.2-py3-none-any.whl", hash = "sha256:ad33ed68db9398f5dfb33282704925bce044bef4261cd4fb59e4e7f9ae505a78"}, - {file = "Django-4.2.tar.gz", hash = "sha256:c36e2ab12824e2ac36afa8b2515a70c53c7742f0d6eaefa7311ec379558db997"}, + {file = "Django-4.2.1-py3-none-any.whl", hash = "sha256:066b6debb5ac335458d2a713ed995570536c8b59a580005acb0732378d5eb1ee"}, + {file = "Django-4.2.1.tar.gz", hash = "sha256:7efa6b1f781a6119a10ac94b4794ded90db8accbe7802281cd26f8664ffed59c"}, ] [package.dependencies] @@ -5366,6 +5366,7 @@ category = "main" optional = false python-versions = "*" files = [ + {file = "wcwidth-0.2.6-py2.py3-none-any.whl", hash = "sha256:795b138f6875577cd91bba52baf9e445cd5118fd32723b460e30a0af30ea230e"}, {file = "wcwidth-0.2.6.tar.gz", hash = "sha256:a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0"}, ] From 02815eff3ccb0ea38024bf34a52c138cdd10b914 Mon Sep 17 00:00:00 2001 From: Alexander-D-Karpov Date: Tue, 9 May 2023 23:26:09 +0300 Subject: [PATCH 3/7] fixed docker --- compose/local/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index 81e7c46..a1ec46e 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -24,7 +24,7 @@ WORKDIR ${APP_HOME} # Install required system dependencies RUN apt-get update && \ - apt-get install -y build-essential libpq-dev gettext libmagic-dev libjpeg-dev zlib1g-dev && \ + apt-get install -y build-essential gdal libpq-dev gettext libmagic-dev libjpeg-dev zlib1g-dev && \ # Dependencies for file preview generation apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg && \ apt-get purge -y --auto-remove -o APT:AutoRemove:RecommendsImportant=false && \ From 9a4324e35fd0b3f3c9f6c762a398e4117a7209a8 Mon Sep 17 00:00:00 2001 From: Alexander-D-Karpov Date: Tue, 9 May 2023 23:38:47 +0300 Subject: [PATCH 4/7] fixed docker --- compose/local/django/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index a1ec46e..e198ba0 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -24,9 +24,9 @@ WORKDIR ${APP_HOME} # Install required system dependencies RUN apt-get update && \ - apt-get install -y build-essential gdal libpq-dev gettext libmagic-dev libjpeg-dev zlib1g-dev && \ + apt-get install -y build-essential libpq-dev gettext libmagic-dev libjpeg-dev zlib1g-dev && \ # Dependencies for file preview generation - apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg && \ + apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg gdal && \ apt-get purge -y --auto-remove -o APT:AutoRemove:RecommendsImportant=false && \ rm -rf /var/lib/apt/lists/* From 44d605934d3c7e78de438d2654228560851343b2 Mon Sep 17 00:00:00 2001 From: Alexander-D-Karpov Date: Tue, 9 May 2023 23:43:24 +0300 Subject: [PATCH 5/7] fixed docker --- compose/local/django/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index e198ba0..ba2bd50 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -23,10 +23,11 @@ ENV BUILD_ENV ${BUILD_ENVIRONMENT} WORKDIR ${APP_HOME} # Install required system dependencies -RUN apt-get update && \ +RUN add-apt-repository ppa:ubuntugis/ppa && \ + apt-get update && \ apt-get install -y build-essential libpq-dev gettext libmagic-dev libjpeg-dev zlib1g-dev && \ # Dependencies for file preview generation - apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg gdal && \ + apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg gdal-bin && \ apt-get purge -y --auto-remove -o APT:AutoRemove:RecommendsImportant=false && \ rm -rf /var/lib/apt/lists/* From 59d3fe37e38eaad1177679915fad1441ae55e2e9 Mon Sep 17 00:00:00 2001 From: Alexander-D-Karpov Date: Tue, 9 May 2023 23:46:44 +0300 Subject: [PATCH 6/7] fixed docker --- compose/local/django/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index ba2bd50..ecca943 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -23,11 +23,10 @@ ENV BUILD_ENV ${BUILD_ENVIRONMENT} WORKDIR ${APP_HOME} # Install required system dependencies -RUN add-apt-repository ppa:ubuntugis/ppa && \ - apt-get update && \ +RUN apt-get update && \ apt-get install -y build-essential libpq-dev gettext libmagic-dev libjpeg-dev zlib1g-dev && \ # Dependencies for file preview generation - apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg gdal-bin && \ + apt-get install -y webp libimage-exiftool-perl libmagickwand-dev ffmpeg libgdal-dev && \ apt-get purge -y --auto-remove -o APT:AutoRemove:RecommendsImportant=false && \ rm -rf /var/lib/apt/lists/* From 779c2a9ccbcf31aa1d6babc7238d57d1d2ff9d63 Mon Sep 17 00:00:00 2001 From: Alexander-D-Karpov Date: Sat, 13 May 2023 21:48:21 +0300 Subject: [PATCH 7/7] added left file upload size --- akarpov/templates/files/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akarpov/templates/files/list.html b/akarpov/templates/files/list.html index c310c95..e4d236e 100644 --- a/akarpov/templates/files/list.html +++ b/akarpov/templates/files/list.html @@ -72,7 +72,7 @@ -

Drag & Drop file(s)
or

+

Drag & Drop file(s) ({{ request.user.left_file_upload | filesizeformat }} left)
or