From 67178e36b6c42926f97178904c245a7bac12b709 Mon Sep 17 00:00:00 2001 From: Alexander-D-Karpov Date: Mon, 27 Mar 2023 17:44:40 +0300 Subject: [PATCH] fixed docker image --- compose/local/django/Dockerfile | 3 +- poetry.lock | 138 +------------------------------- pyproject.toml | 2 +- 3 files changed, 4 insertions(+), 139 deletions(-) diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index 50ad54a..702d2dd 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -26,7 +26,8 @@ WORKDIR ${APP_HOME} 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 poppler-utils libfile-mimeinfo-perl libimage-exiftool-perl ghostscript libsecret-1-0 zlib1g-dev libjpeg-dev imagemagick libmagic1 webp libreoffice inkscape ffmpeg xvfb && \ + apt-get install -y webp libimage-exiftool-perl libmagickwand-dev && \ + # apt-get install -y poppler-utils libfile-mimeinfo-perl ghostscript libsecret-1-0 zlib1g-dev libjpeg-dev imagemagick libmagic1 libreoffice inkscape ffmpeg xvfb && \ apt-get purge -y --auto-remove -o APT:AutoRemove:RecommendsImportant=false && \ rm -rf /var/lib/apt/lists/* diff --git a/poetry.lock b/poetry.lock index 20f5c41..f5b4eb8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -273,48 +273,6 @@ d = ["aiohttp (>=3.7.4)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] -[[package]] -name = "cairocffi" -version = "1.5.0" -description = "cffi-based cairo bindings for Python" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "cairocffi-1.5.0.tar.gz", hash = "sha256:d105b49009d9b4970a459e38ff030cb5dfc8c8ee231e867d28f77ee9df44495e"}, -] - -[package.dependencies] -cffi = ">=1.1.0" - -[package.extras] -doc = ["sphinx", "sphinx_rtd_theme"] -test = ["flake8", "isort", "numpy", "pikepdf", "pytest"] -xcb = ["xcffib (>=0.3.2)"] - -[[package]] -name = "cairosvg" -version = "2.7.0" -description = "A Simple SVG Converter based on Cairo" -category = "main" -optional = false -python-versions = ">=3.5" -files = [ - {file = "CairoSVG-2.7.0-py3-none-any.whl", hash = "sha256:17cb96423a896258848322a95c80160e714a58f1af3dd73b8e1750994519b9f9"}, - {file = "CairoSVG-2.7.0.tar.gz", hash = "sha256:ac4dc7c1d38b3a15717db2633a3a383012e0be664c727c911637e6af6a49293c"}, -] - -[package.dependencies] -cairocffi = "*" -cssselect2 = "*" -defusedxml = "*" -pillow = "*" -tinycss2 = "*" - -[package.extras] -doc = ["sphinx", "sphinx-rtd-theme"] -test = ["flake8", "isort", "pytest"] - [[package]] name = "celery" version = "5.2.7" @@ -793,26 +751,6 @@ test = ["iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-co test-randomorder = ["pytest-randomly"] tox = ["tox"] -[[package]] -name = "cssselect2" -version = "0.7.0" -description = "CSS selectors for Python ElementTree" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "cssselect2-0.7.0-py3-none-any.whl", hash = "sha256:fd23a65bfd444595913f02fc71f6b286c29261e354c41d722ca7a261a49b5969"}, - {file = "cssselect2-0.7.0.tar.gz", hash = "sha256:1ccd984dab89fc68955043aca4e1b03e0cf29cad9880f6e28e3ba7a74b14aa5a"}, -] - -[package.dependencies] -tinycss2 = "*" -webencodings = "*" - -[package.extras] -doc = ["sphinx", "sphinx_rtd_theme"] -test = ["flake8", "isort", "pytest"] - [[package]] name = "decorator" version = "5.1.1" @@ -1557,24 +1495,6 @@ files = [ [package.dependencies] python-dateutil = ">=2.4" -[[package]] -name = "ffmpeg-python" -version = "0.2.0" -description = "Python bindings for FFmpeg - with complex filtering support" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "ffmpeg-python-0.2.0.tar.gz", hash = "sha256:65225db34627c578ef0e11c8b1eb528bb35e024752f6f10b78c011f6f64c4127"}, - {file = "ffmpeg_python-0.2.0-py3-none-any.whl", hash = "sha256:ac441a0404e053f8b6a1113a77c0f452f1cfc62f6344a769475ffdc0f56c23c5"}, -] - -[package.dependencies] -future = "*" - -[package.extras] -dev = ["Sphinx (==2.1.0)", "future (==0.17.1)", "numpy (==1.16.4)", "pytest (==4.6.1)", "pytest-mock (==1.10.4)", "tox (==3.12.1)"] - [[package]] name = "filelock" version = "3.10.6" @@ -1658,17 +1578,6 @@ files = [ {file = "funcy-1.18.tar.gz", hash = "sha256:15448d19a8ebcc7a585afe7a384a19186d0bd67cbf56fb42cd1fd0f76313f9b2"}, ] -[[package]] -name = "future" -version = "0.18.3" -description = "Clean single-source support for Python 3 and 2" -category = "main" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "future-0.18.3.tar.gz", hash = "sha256:34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307"}, -] - [[package]] name = "gunicorn" version = "20.1.0" @@ -2587,13 +2496,10 @@ files = [ ] [package.dependencies] -cairosvg = {version = "*", optional = true, markers = "extra == \"all\""} -ffmpeg-python = {version = "*", optional = true, markers = "extra == \"all\""} filelock = "*" pyexifinfo = "*" python-magic = "*" Wand = "*" -xvfbwrapper = {version = "*", optional = true, markers = "extra == \"all\""} [package.extras] 3d = ["vtk"] @@ -3577,25 +3483,6 @@ files = [ {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"}, ] -[[package]] -name = "tinycss2" -version = "1.2.1" -description = "A tiny CSS parser" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tinycss2-1.2.1-py3-none-any.whl", hash = "sha256:2b80a96d41e7c3914b8cda8bc7f705a4d9c49275616e886103dd839dfc847847"}, - {file = "tinycss2-1.2.1.tar.gz", hash = "sha256:8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627"}, -] - -[package.dependencies] -webencodings = ">=0.4" - -[package.extras] -doc = ["sphinx", "sphinx_rtd_theme"] -test = ["flake8", "isort", "pytest"] - [[package]] name = "tomli" version = "2.0.1" @@ -3892,18 +3779,6 @@ files = [ {file = "wcwidth-0.2.6.tar.gz", hash = "sha256:a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0"}, ] -[[package]] -name = "webencodings" -version = "0.5.1" -description = "Character encoding aliases for legacy web content" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, - {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, -] - [[package]] name = "werkzeug" version = "2.2.3" @@ -4023,18 +3898,7 @@ files = [ {file = "wrapt-1.15.0.tar.gz", hash = "sha256:d06730c6aed78cee4126234cf2d071e01b44b915e725a6cb439a879ec9754a3a"}, ] -[[package]] -name = "xvfbwrapper" -version = "0.2.9" -description = "run headless display inside X virtual framebuffer (Xvfb)" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "xvfbwrapper-0.2.9.tar.gz", hash = "sha256:bcf4ae571941b40254faf7a73432dfc119ad21ce688f1fdec533067037ecfc24"}, -] - [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "fb7f1e1b7dc4819e5b86b247de8485a3be33db285283a39279c027ca073a7643" +content-hash = "0c661e70b5aa4f101b46b12739ebb054a8ebda475af5465c8b9e272449ab791d" diff --git a/pyproject.toml b/pyproject.toml index 9031687..96feb1f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,8 +70,8 @@ django-active-link = "^0.1.8" channels = "^4.0.0" django-upload-validator = "^1.1.6" markdown = "^3.4.3" -preview-generator = {extras = ["all"], version = "^0.29"} pydotplus = "^2.0.2" +preview-generator = "^0.29" [build-system]