From dc4ea4e2c13bc792812e4bf0be2ed656f5787f0c Mon Sep 17 00:00:00 2001 From: J-E Castagnede Date: Wed, 10 Apr 2024 15:58:57 +0200 Subject: [PATCH] use uv --- Makefile | 2 +- dev-requirements.txt | 462 ++++++++---------------------------------- docker/Dockerfile | 16 +- docs/requirements.txt | 76 ++----- pyproject.toml | 6 +- requirements.txt | 87 ++------ 6 files changed, 134 insertions(+), 515 deletions(-) diff --git a/Makefile b/Makefile index fc1793a0c5..e29e4ee160 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ else docker_compose=docker-compose endif -dep_update = pip-compile -q --strip-extras && pip-compile -c requirements.txt -q --strip-extras --extra dev --output-file dev-requirements.txt && pip-compile --strip-extras -q docs/requirements.in +dep_update = uv pip compile -q --strip-extras pyproject.toml --output-file requirements.txt && uv pip compile pyproject.toml -c requirements.txt -q --strip-extras --extra dev --output-file dev-requirements.txt && uv pip compile --strip-extras -q docs/requirements.in --output-file docs/requirements.txt -include Makefile.perso.mk diff --git a/dev-requirements.txt b/dev-requirements.txt index 8902943887..199c2866ec 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,148 +1,87 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --constraint=requirements.txt --extra=dev --output-file=dev-requirements.txt --strip-extras -# +# This file was autogenerated by uv via the following command: +# uv pip compile pyproject.toml -c requirements.txt --strip-extras --extra dev --output-file dev-requirements.txt amqp==5.1.1 - # via - # -c requirements.txt - # kombu + # via kombu appy==1.0.15 - # via - # -c requirements.txt - # django-appypod + # via django-appypod asgiref==3.7.2 - # via - # -c requirements.txt - # django + # via django async-timeout==4.0.3 - # via - # -c requirements.txt - # redis + # via redis attrs==23.1.0 - # via - # -c requirements.txt - # fiona + # via fiona backports-zoneinfo==0.2.1 # via - # -c requirements.txt # celery # kombu beautifulsoup4==4.12.2 - # via - # -c requirements.txt - # mapentity + # via mapentity billiard==4.1.0 - # via - # -c requirements.txt - # celery + # via celery btrees==5.0 - # via - # -c requirements.txt - # zodb -build==1.0.0 - # via pip-tools + # via zodb cachetools==5.3.1 - # via - # -c requirements.txt - # large-image + # via large-image cairocffi==0.9.0 # via - # -c requirements.txt # cairosvg - # geotrek (pyproject.toml) # mapentity # weasyprint cairosvg==2.7.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) - # weasyprint + # via weasyprint celery==5.3.4 - # via - # -c requirements.txt - # django-celery-results - # geotrek (pyproject.toml) + # via django-celery-results certifi==2023.7.22 # via - # -c requirements.txt # fiona # requests # sentry-sdk cffi==1.16.0 # via - # -c requirements.txt # cairocffi # persistent # pyvips # weasyprint chardet==5.2.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) - # reportlab + # via reportlab charset-normalizer==3.2.0 - # via - # -c requirements.txt - # requests + # via requests click==8.1.3 # via - # -c requirements.txt # celery # click-didyoumean # click-plugins # click-repl # cligj # fiona - # pip-tools click-didyoumean==0.3.0 - # via - # -c requirements.txt - # celery + # via celery click-plugins==1.1.1 # via - # -c requirements.txt # celery # fiona click-repl==0.3.0 - # via - # -c requirements.txt - # celery + # via celery cligj==0.7.2 - # via - # -c requirements.txt - # fiona + # via fiona coreapi==2.3.3 - # via - # -c requirements.txt - # drf-yasg - # geotrek (pyproject.toml) + # via drf-yasg coreschema==0.0.4 # via - # -c requirements.txt # coreapi # drf-yasg - # geotrek (pyproject.toml) coverage==7.3.1 - # via geotrek (pyproject.toml) cssselect2==0.7.0 # via - # -c requirements.txt # cairosvg # svglib # weasyprint datetime==5.2 - # via - # -c requirements.txt - # appy + # via appy defusedxml==0.7.1 - # via - # -c requirements.txt - # cairosvg + # via cairosvg django==3.2.25 # via - # -c requirements.txt # django-appconf # django-appypod # django-celery-results @@ -156,94 +95,49 @@ django==3.2.25 # django-leaflet # django-modelcluster # django-modeltranslation + # django-treebeard # django-weasyprint # djangorestframework # drf-yasg # easy-thumbnails - # geotrek (pyproject.toml) # mapentity # paperclip django-appconf==1.0.5 - # via - # -c requirements.txt - # django-compressor + # via django-compressor django-appypod==2.0.7 - # via - # -c requirements.txt - # mapentity + # via mapentity django-celery-results==2.5.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) django-clearcache==1.2.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) django-colorfield==0.10.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) django-compressor==4.3.1 - # via - # -c requirements.txt - # mapentity + # via mapentity django-crispy-forms==1.13.0 - # via - # -c requirements.txt - # mapentity + # via mapentity django-debug-toolbar==4.3.0 - # via geotrek (pyproject.toml) django-embed-video==1.4.9 # via - # -c requirements.txt # mapentity # paperclip django-extended-choices==1.3.3 - # via - # -c requirements.txt - # geotrek (pyproject.toml) django-extensions==3.2.3 - # via geotrek (pyproject.toml) django-filter==22.1 - # via - # -c requirements.txt - # mapentity + # via mapentity django-js-asset==2.0.0 - # via - # -c requirements.txt - # django-mptt + # via django-mptt django-large-image==0.8.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) django-leaflet==0.19.post9 - # via - # -c requirements.txt - # mapentity + # via mapentity django-modelcluster==6.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) django-modeltranslation==0.18.11 - # via - # -c requirements.txt - # mapentity + # via mapentity django-mptt==0.14.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) django-tinymce==3.5.0 - # via - # -c requirements.txt - # mapentity + # via mapentity +django-treebeard==4.7.1 django-weasyprint==1.1.0.post2 - # via - # -c requirements.txt - # geotrek (pyproject.toml) - # mapentity + # via mapentity djangorestframework==3.14.0 # via - # -c requirements.txt # django-large-image # djangorestframework-datatables # djangorestframework-gis @@ -251,248 +145,128 @@ djangorestframework==3.14.0 # drf-yasg # mapentity djangorestframework-datatables==0.7.0 - # via - # -c requirements.txt - # mapentity + # via mapentity djangorestframework-gis==1.0 - # via - # -c requirements.txt - # mapentity + # via mapentity docutils==0.20.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) drf-dynamic-fields==0.4.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) drf-extensions==0.7.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) drf-yasg==1.21.5 - # via - # -c requirements.txt - # django-large-image - # geotrek (pyproject.toml) + # via django-large-image easy-thumbnails==2.8.5 # via - # -c requirements.txt - # geotrek (pyproject.toml) # mapentity # paperclip env-file==2020.12.3 - # via - # -c requirements.txt - # geotrek (pyproject.toml) factory-boy==3.3.0 - # via geotrek (pyproject.toml) faker==19.3.1 # via factory-boy filelock==3.8.0 - # via - # -c requirements.txt - # django-large-image + # via django-large-image fiona==1.9.4.post1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) - # mapentity + # via mapentity flake8==6.1.0 - # via - # flake8-pyproject - # geotrek (pyproject.toml) + # via flake8-pyproject flake8-pyproject==1.2.3 - # via geotrek (pyproject.toml) freezegun==1.2.2 - # via geotrek (pyproject.toml) geojson==2.5.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) - # tif2geojson + # via tif2geojson gpxpy==1.5.0 - # via - # -c requirements.txt - # mapentity + # via mapentity gunicorn==21.2.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) html5lib==1.1 - # via - # -c requirements.txt - # weasyprint + # via weasyprint idna==3.4 - # via - # -c requirements.txt - # requests + # via requests importlib-metadata==6.8.0 # via - # -c requirements.txt - # build # fiona # markdown inflection==0.5.1 - # via - # -c requirements.txt - # drf-yasg + # via drf-yasg itypes==1.2.0 - # via - # -c requirements.txt - # coreapi + # via coreapi jinja2==3.1.3 - # via - # -c requirements.txt - # coreschema + # via coreschema kombu==5.3.2 - # via - # -c requirements.txt - # celery + # via celery landez==2.5.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) large-image==1.20.3 # via - # -c requirements.txt # django-large-image # large-image-source-vips large-image-source-vips==1.17.2 - # via - # -c requirements.txt - # geotrek (pyproject.toml) lxml==4.9.3 # via - # -c requirements.txt - # geotrek (pyproject.toml) # mapentity # svglib -mapentity==8.7.2 - # via - # -c requirements.txt - # geotrek (pyproject.toml) +mapentity==8.8.0 markdown==3.4.4 - # via - # -c requirements.txt - # geotrek (pyproject.toml) markupsafe==2.1.3 - # via - # -c requirements.txt - # jinja2 + # via jinja2 mbutil==0.3.0 - # via - # -c requirements.txt - # landez + # via landez mccabe==0.7.0 # via flake8 numpy==1.23.4 # via - # -c requirements.txt # large-image # large-image-source-vips # shapely packaging==21.3 # via - # -c requirements.txt - # build # drf-yasg # gunicorn # large-image-source-vips palettable==3.3.0 - # via - # -c requirements.txt - # large-image + # via large-image paperclip==2.7.2 - # via - # -c requirements.txt - # geotrek (pyproject.toml) - # mapentity + # via mapentity papersize==1.3.0 - # via - # -c requirements.txt - # pdfimpose + # via pdfimpose pdfimpose==1.1.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) persistent==5.0 # via - # -c requirements.txt # btrees # zodb -pillow==10.2.0 +pillow==10.3.0 # via - # -c requirements.txt # cairosvg # django-colorfield # easy-thumbnails - # geotrek (pyproject.toml) # large-image # paperclip # reportlab # weasyprint -pip-tools==7.3.0 - # via geotrek (pyproject.toml) prompt-toolkit==3.0.39 - # via - # -c requirements.txt - # click-repl + # via click-repl psutil==5.9.5 - # via - # -c requirements.txt - # large-image + # via large-image psycopg2==2.9.7 - # via - # -c requirements.txt - # geotrek (pyproject.toml) pycodestyle==2.11.0 # via flake8 pycparser==2.21 - # via - # -c requirements.txt - # cffi + # via cffi pyflakes==3.1.0 # via flake8 pygal==3.0.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) pymemcache==4.0.0 - # via - # -c requirements.txt - # geotrek (pyproject.toml) pyopenair==1.2.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) pyparsing==3.1.1 - # via - # -c requirements.txt - # packaging + # via packaging pypdf2==1.27.5 - # via - # -c requirements.txt - # pdfimpose + # via pdfimpose pyphen==0.11.0 - # via - # -c requirements.txt - # weasyprint -pyproject-hooks==1.0.0 - # via build + # via weasyprint python-dateutil==2.8.2 # via - # -c requirements.txt # celery # faker # freezegun python-magic==0.4.27 - # via - # -c requirements.txt - # paperclip + # via paperclip pytz==2023.3.post1 # via - # -c requirements.txt # datetime # django # django-modelcluster @@ -500,183 +274,117 @@ pytz==2023.3.post1 # djangorestframework-datatables # drf-yasg pyvips==2.2.1 - # via - # -c requirements.txt - # large-image-source-vips + # via large-image-source-vips rcssmin==1.1.1 - # via - # -c requirements.txt - # django-compressor + # via django-compressor redis==4.5.4 - # via - # -c requirements.txt - # geotrek (pyproject.toml) reportlab==4.1.0 # via - # -c requirements.txt # easy-thumbnails # svglib requests==2.31.0 # via - # -c requirements.txt # coreapi # django-embed-video # landez # mapentity rjsmin==1.2.1 - # via - # -c requirements.txt - # django-compressor + # via django-compressor ruamel-yaml==0.17.35 - # via - # -c requirements.txt - # drf-yasg + # via drf-yasg ruamel-yaml-clib==0.2.7 - # via - # -c requirements.txt - # ruamel-yaml + # via ruamel-yaml sentry-sdk==1.30.0 +setuptools==69.2.0 # via - # -c requirements.txt - # geotrek (pyproject.toml) + # weasyprint + # zc-lockfile + # zodbpickle + # zope-interface shapely==2.0.2 - # via - # -c requirements.txt - # pyopenair + # via pyopenair simplekml==1.3.6 - # via - # -c requirements.txt - # geotrek (pyproject.toml) six==1.16.0 # via - # -c requirements.txt # django-extended-choices # fiona # html5lib # python-dateutil # zodb soupsieve==2.5 - # via - # -c requirements.txt - # beautifulsoup4 + # via beautifulsoup4 sqlparse==0.4.4 # via - # -c requirements.txt # django # django-debug-toolbar svglib==1.5.1 - # via - # -c requirements.txt - # easy-thumbnails + # via easy-thumbnails +tblib==3.0.0 tif2geojson==0.1.3 - # via - # -c requirements.txt - # geotrek (pyproject.toml) tinycss2==1.2.1 # via - # -c requirements.txt # cairosvg # cssselect2 # svglib # weasyprint tomli==2.0.1 - # via - # build - # flake8-pyproject - # pip-tools - # pyproject-hooks + # via flake8-pyproject transaction==3.1.0 - # via - # -c requirements.txt - # zodb + # via zodb typing-extensions==4.8.0 # via - # -c requirements.txt # asgiref # django-modeltranslation # faker # kombu tzdata==2023.3 # via - # -c requirements.txt # backports-zoneinfo # celery # mapentity uritemplate==4.1.1 # via - # -c requirements.txt # coreapi # drf-yasg urllib3==1.26.18 # via - # -c requirements.txt # requests # sentry-sdk values==2020.12.3 - # via - # -c requirements.txt - # env-file + # via env-file vine==5.0.0 # via - # -c requirements.txt # amqp # celery # kombu wcwidth==0.2.6 - # via - # -c requirements.txt - # prompt-toolkit + # via prompt-toolkit weasyprint==52.5 # via - # -c requirements.txt # django-weasyprint - # geotrek (pyproject.toml) # mapentity webencodings==0.5.1 # via - # -c requirements.txt # cssselect2 # html5lib # tinycss2 -wheel==0.41.2 - # via pip-tools xlrd==2.0.1 - # via - # -c requirements.txt - # geotrek (pyproject.toml) xmltodict==0.13.0 - # via - # -c requirements.txt - # tif2geojson + # via tif2geojson zc-lockfile==3.0.post1 - # via - # -c requirements.txt - # zodb + # via zodb zconfig==4.0 - # via - # -c requirements.txt - # zodb + # via zodb zipp==3.17.0 - # via - # -c requirements.txt - # importlib-metadata + # via importlib-metadata zodb==5.8.1 - # via - # -c requirements.txt - # appy + # via appy zodbpickle==3.0.1 - # via - # -c requirements.txt - # zodb + # via zodb zope-interface==6.0 # via - # -c requirements.txt # btrees # datetime # persistent # transaction # zodb - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/docker/Dockerfile b/docker/Dockerfile index 821d43fe9c..e3cac63f0d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -65,23 +65,24 @@ USER root RUN apt-get update -qq && apt-get install -y -qq \ git \ python3.8-dev \ - python3.8-venv \ + python3-pip \ build-essential \ libpq-dev &&\ apt-get clean all && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/* +RUN pip install --no-cache-dir uv + USER geotrek -RUN python3.8 -m venv /opt/venv -RUN /opt/venv/bin/pip install --no-cache-dir -U pip setuptools wheel + +RUN uv venv /opt/venv COPY requirements.txt requirements.txt -RUN /opt/venv/bin/pip install --no-cache-dir -r requirements.txt -U +RUN . /opt/venv/bin/activate && uv pip install -r requirements.txt FROM build as dev COPY dev-requirements.txt dev-requirements.txt -RUN /opt/venv/bin/pip install --no-cache-dir -r dev-requirements.txt COPY ./docs/requirements.txt doc-requirements.txt -RUN /opt/venv/bin/pip install --no-cache-dir -r doc-requirements.txt +RUN . /opt/venv/bin/activate && uv pip sync dev-requirements.txt && uv pip install -r doc-requirements.txt CMD ["./manage.py", "runserver", "0.0.0.0:8000"] @@ -92,7 +93,8 @@ ENV ENV prod COPY --chown=geotrek:geotrek --from=build /opt/venv /opt/venv COPY --chown=geotrek:geotrek geotrek/ geotrek/ COPY --chown=geotrek:geotrek manage.py manage.py -COPY --chown=geotrek:geotrek pyproject.toml pyproject.toml +COPY --chown=geotrek:geotrek VERSION VERSION +COPY --chown=geotrek:geotrek setup.cfg setup.cfg RUN CUSTOM_SETTINGS_FILE= SECRET_KEY=tmp /opt/venv/bin/python ./manage.py compilemessages diff --git a/docs/requirements.txt b/docs/requirements.txt index 14c8dba3ae..6b4ce32d45 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,9 +1,5 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --strip-extras docs/requirements.in -# +# This file was autogenerated by uv via the following command: +# uv pip compile --strip-extras docs/requirements.in --output-file docs/requirements.txt alabaster==0.7.13 # via sphinx babel==2.14.0 @@ -11,22 +7,15 @@ babel==2.14.0 # sphinx # sphinx-intl certifi==2023.7.22 - # via - # -c docs/../dev-requirements.txt - # requests + # via requests charset-normalizer==3.2.0 - # via - # -c docs/../dev-requirements.txt - # requests + # via requests click==8.1.3 - # via - # -c docs/../dev-requirements.txt - # sphinx-intl + # via sphinx-intl colorama==0.4.6 # via sphinx-autobuild docutils==0.20.1 # via - # -c docs/../dev-requirements.txt # sphinx # sphinx-rtd-theme dom-toml==0.6.1 @@ -36,67 +25,47 @@ domdf-python-tools==3.8.0.post2 # dom-toml # sphinx-pyproject idna==3.4 - # via - # -c docs/../dev-requirements.txt - # requests + # via requests imagesize==1.4.1 # via sphinx importlib-metadata==6.8.0 # via - # -c docs/../dev-requirements.txt # domdf-python-tools # sphinx jinja2==3.1.3 - # via - # -c docs/../dev-requirements.txt - # sphinx + # via sphinx livereload==2.6.3 # via sphinx-autobuild markupsafe==2.1.3 - # via - # -c docs/../dev-requirements.txt - # jinja2 + # via jinja2 natsort==8.4.0 # via domdf-python-tools packaging==21.3 - # via - # -c docs/../dev-requirements.txt - # sphinx + # via sphinx pygments==2.17.2 # via sphinx pyparsing==3.1.1 - # via - # -c docs/../dev-requirements.txt - # packaging + # via packaging pytz==2023.3.post1 - # via - # -c docs/../dev-requirements.txt - # babel + # via babel requests==2.31.0 - # via - # -c docs/../dev-requirements.txt - # sphinx + # via sphinx +setuptools==69.2.0 + # via sphinx-intl six==1.16.0 - # via - # -c docs/../dev-requirements.txt - # livereload + # via livereload snowballstemmer==2.2.0 # via sphinx sphinx==7.1.2 # via - # -r docs/requirements.in # sphinx-autobuild # sphinx-intl # sphinx-rtd-theme # sphinxcontrib-jquery sphinx-autobuild==2021.3.14 - # via -r docs/requirements.in sphinx-intl==2.1.0 - # via -r docs/requirements.in sphinx-pyproject==0.3.0 - # via -r docs/requirements.in sphinx-rtd-theme==2.0.0 - # via -r docs/requirements.in sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -116,17 +85,8 @@ toml==0.10.2 tornado==6.4 # via livereload typing-extensions==4.8.0 - # via - # -c docs/../dev-requirements.txt - # domdf-python-tools + # via domdf-python-tools urllib3==1.26.18 - # via - # -c docs/../dev-requirements.txt - # requests + # via requests zipp==3.17.0 - # via - # -c docs/../dev-requirements.txt - # importlib-metadata - -# The following packages are considered to be unsafe in a requirements file: -# setuptools + # via importlib-metadata diff --git a/pyproject.toml b/pyproject.toml index 3c25a2599f..dc64399e7a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,6 +49,7 @@ dependencies = [ "weasyprint==52.5", 'django-weasyprint<2.0.0', "django-clearcache", + 'django-treebeard', "easy-thumbnails[svg]", "pyopenair", 'gunicorn', @@ -67,7 +68,7 @@ keywords = ["Python", "Django", "GIS", "Tourism", "Trekking"] [project.optional-dependencies] dev = [ - "pip-tools", + "tblib", "lxml", "flake8", "flake8-pyproject", @@ -128,7 +129,8 @@ exclude_lines = [ 'pragma: no cover', 'if settings.DEBUG or settings.TEST:', 'from django.contrib.admin import ModelAdmin as TabbedTranslationAdmin, TabularInline as TranslationTabularInline', - 'from django.contrib.admin import ModelAdmin as TabbedTranslationAdmin' + 'from django.contrib.admin import ModelAdmin as TabbedTranslationAdmin', + 'pragma: no cover' ] [tool.flake8] diff --git a/requirements.txt b/requirements.txt index 6c81e16a2f..09f10fb719 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,5 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --strip-extras -# +# This file was autogenerated by uv via the following command: +# uv pip compile --strip-extras pyproject.toml --output-file requirements.txt amqp==5.1.1 # via kombu appy==1.0.15 @@ -29,17 +25,12 @@ cachetools==5.3.1 cairocffi==0.9.0 # via # cairosvg - # geotrek (pyproject.toml) # mapentity # weasyprint cairosvg==2.7.1 - # via - # geotrek (pyproject.toml) - # weasyprint + # via weasyprint celery==5.3.4 - # via - # django-celery-results - # geotrek (pyproject.toml) + # via django-celery-results certifi==2023.7.22 # via # fiona @@ -52,9 +43,7 @@ cffi==1.16.0 # pyvips # weasyprint chardet==5.2.0 - # via - # geotrek (pyproject.toml) - # reportlab + # via reportlab charset-normalizer==3.2.0 # via requests click==8.1.3 @@ -76,14 +65,11 @@ click-repl==0.3.0 cligj==0.7.2 # via fiona coreapi==2.3.3 - # via - # drf-yasg - # geotrek (pyproject.toml) + # via drf-yasg coreschema==0.0.4 # via # coreapi # drf-yasg - # geotrek (pyproject.toml) cssselect2==0.7.0 # via # cairosvg @@ -111,7 +97,6 @@ django==3.2.25 # djangorestframework # drf-yasg # easy-thumbnails - # geotrek (pyproject.toml) # mapentity # paperclip django-appconf==1.0.5 @@ -119,11 +104,8 @@ django-appconf==1.0.5 django-appypod==2.0.7 # via mapentity django-celery-results==2.5.1 - # via geotrek (pyproject.toml) django-clearcache==1.2.1 - # via geotrek (pyproject.toml) django-colorfield==0.10.1 - # via geotrek (pyproject.toml) django-compressor==4.3.1 # via mapentity django-crispy-forms==1.13.0 @@ -133,29 +115,22 @@ django-embed-video==1.4.9 # mapentity # paperclip django-extended-choices==1.3.3 - # via geotrek (pyproject.toml) django-filter==22.1 # via mapentity django-js-asset==2.0.0 # via django-mptt django-large-image==0.8.1 - # via geotrek (pyproject.toml) django-leaflet==0.19.post9 # via mapentity django-modelcluster==6.0 - # via geotrek (pyproject.toml) django-modeltranslation==0.18.11 # via mapentity django-mptt==0.14.0 - # via geotrek (pyproject.toml) django-tinymce==3.5.0 # via mapentity django-treebeard==4.7.1 - # via Geotrek-admin (pyproject.toml) django-weasyprint==1.1.0.post2 - # via - # geotrek (pyproject.toml) - # mapentity + # via mapentity djangorestframework==3.14.0 # via # django-large-image @@ -169,36 +144,24 @@ djangorestframework-datatables==0.7.0 djangorestframework-gis==1.0 # via mapentity docutils==0.20.1 - # via geotrek (pyproject.toml) drf-dynamic-fields==0.4.0 - # via geotrek (pyproject.toml) drf-extensions==0.7.1 - # via geotrek (pyproject.toml) drf-yasg==1.21.5 - # via - # django-large-image - # geotrek (pyproject.toml) + # via django-large-image easy-thumbnails==2.8.5 # via - # geotrek (pyproject.toml) # mapentity # paperclip env-file==2020.12.3 - # via geotrek (pyproject.toml) filelock==3.8.0 # via django-large-image fiona==1.9.4.post1 - # via - # geotrek (pyproject.toml) - # mapentity + # via mapentity geojson==2.5.0 - # via - # geotrek (pyproject.toml) - # tif2geojson + # via tif2geojson gpxpy==1.5.0 # via mapentity gunicorn==21.2.0 - # via geotrek (pyproject.toml) html5lib==1.1 # via weasyprint idna==3.4 @@ -216,22 +179,17 @@ jinja2==3.1.3 kombu==5.3.2 # via celery landez==2.5.0 - # via geotrek (pyproject.toml) large-image==1.20.3 # via # django-large-image # large-image-source-vips large-image-source-vips==1.17.2 - # via geotrek (pyproject.toml) lxml==4.9.3 # via # mapentity # svglib mapentity==8.8.0 - # via Geotrek-admin (pyproject.toml) - # via geotrek (pyproject.toml) markdown==3.4.4 - # via geotrek (pyproject.toml) markupsafe==2.1.3 # via jinja2 mbutil==0.3.0 @@ -249,13 +207,10 @@ packaging==21.3 palettable==3.3.0 # via large-image paperclip==2.7.2 - # via - # geotrek (pyproject.toml) - # mapentity + # via mapentity papersize==1.3.0 # via pdfimpose pdfimpose==1.1.0 - # via geotrek (pyproject.toml) persistent==5.0 # via # btrees @@ -265,7 +220,6 @@ pillow==10.3.0 # cairosvg # django-colorfield # easy-thumbnails - # geotrek (pyproject.toml) # large-image # paperclip # reportlab @@ -275,15 +229,11 @@ prompt-toolkit==3.0.39 psutil==5.9.5 # via large-image psycopg2==2.9.7 - # via geotrek (pyproject.toml) pycparser==2.21 # via cffi pygal==3.0.0 - # via geotrek (pyproject.toml) pymemcache==4.0.0 - # via geotrek (pyproject.toml) pyopenair==1.2.1 - # via geotrek (pyproject.toml) pyparsing==3.1.1 # via packaging pypdf2==1.27.5 @@ -307,7 +257,6 @@ pyvips==2.2.1 rcssmin==1.1.1 # via django-compressor redis==4.5.4 - # via geotrek (pyproject.toml) reportlab==4.1.0 # via # easy-thumbnails @@ -325,11 +274,15 @@ ruamel-yaml==0.17.35 ruamel-yaml-clib==0.2.7 # via ruamel-yaml sentry-sdk==1.30.0 - # via geotrek (pyproject.toml) +setuptools==69.2.0 + # via + # weasyprint + # zc-lockfile + # zodbpickle + # zope-interface shapely==2.0.2 # via pyopenair simplekml==1.3.6 - # via geotrek (pyproject.toml) six==1.16.0 # via # django-extended-choices @@ -344,7 +297,6 @@ sqlparse==0.4.4 svglib==1.5.1 # via easy-thumbnails tif2geojson==0.1.3 - # via geotrek (pyproject.toml) tinycss2==1.2.1 # via # cairosvg @@ -383,7 +335,6 @@ wcwidth==0.2.6 weasyprint==52.5 # via # django-weasyprint - # geotrek (pyproject.toml) # mapentity webencodings==0.5.1 # via @@ -391,7 +342,6 @@ webencodings==0.5.1 # html5lib # tinycss2 xlrd==2.0.1 - # via geotrek (pyproject.toml) xmltodict==0.13.0 # via tif2geojson zc-lockfile==3.0.post1 @@ -411,6 +361,3 @@ zope-interface==6.0 # persistent # transaction # zodb - -# The following packages are considered to be unsafe in a requirements file: -# setuptools