From d81aeb1f7fb7f6765f5be8967d96b22aa532c6fa Mon Sep 17 00:00:00 2001 From: nobohan Date: Mon, 17 Jul 2023 12:32:48 +0200 Subject: [PATCH] #40 fix pip dependency issue with fiona and utils-flask-sqla-geo using python3.8 --- Dockerfile-back | 5 +--- patches/back/requirements.txt | 53 ----------------------------------- vendor/GeoNature-citizen | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 patches/back/requirements.txt diff --git a/Dockerfile-back b/Dockerfile-back index 20fe0d0..afb1029 100644 --- a/Dockerfile-back +++ b/Dockerfile-back @@ -1,5 +1,4 @@ -FROM debian:buster-slim -# todo utiliser image python3 ? +FROM python:3.8-slim-buster ## install dependencies RUN apt-get update && \ @@ -21,8 +20,6 @@ RUN echo "appuser ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers COPY vendor/GeoNature-citizen/ /home/appuser/citizen/ # patches -#NB: use custom requirements.txt for avoiding fiona installation (GDAL issue) -COPY patches/back/requirements.txt /home/appuser/citizen/backend/requirements.txt COPY patches/back/default_config.toml /home/appuser/citizen/config/config.toml COPY patches/settings.ini /home/appuser/citizen/config/settings.ini COPY patches/back/wsgi.py /home/appuser/citizen/backend/wsgi.py diff --git a/patches/back/requirements.txt b/patches/back/requirements.txt deleted file mode 100644 index d3a1746..0000000 --- a/patches/back/requirements.txt +++ /dev/null @@ -1,53 +0,0 @@ -attrs==21.4.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -certifi==2021.10.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -charset-normalizer==2.0.11; python_full_version >= "3.6.0" and python_version >= "3" -click-plugins==1.1.1 -click==7.1.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4" -cligj==0.7.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version < "4" -coloredlogs==15.0.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -# fiona==1.8.21 -flasgger==0.9.5 -flask-admin==1.6.0; python_version >= "3.6" -flask-caching==1.10.1; python_version >= "3.5" -flask-ckeditor==0.4.6 -flask-cors==3.0.10 -flask-jwt-extended==4.3.1; python_version >= "3.6" and python_version < "4" -flask-sqlalchemy==2.5.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") -flask==1.1.4; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -geoalchemy2==0.8.5 -geog==0.0.2 -geojson==2.5.0 -greenlet==1.1.2; python_version >= "3" and python_full_version < "3.0.0" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") or python_version >= "3" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") and python_full_version >= "3.5.0" -gunicorn==20.1.0; python_version >= "3.5" -humanfriendly==10.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -idna==3.3; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" -importlib-metadata==4.8.3; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6" -itsdangerous==1.1.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -jinja2==2.11.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -jsonschema==4.0.0 -markupsafe==2.0.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -marshmallow==3.14.1; python_version >= "3.6" -mistune==2.0.2 -munch==2.5.0 -numpy==1.19.5; python_version >= "3.6" -passlib==1.7.4 -psycopg2-binary==2.9.3; python_version >= "3.6" -pyjwt==2.3.0; python_version >= "3.6" and python_version < "4" -pyreadline3==3.4.1; sys_platform == "win32" and python_version >= "3.8" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0") -pyreadline==2.1; sys_platform == "win32" and python_version < "3.8" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0") -pyrsistent==0.18.0; python_version >= "3.6" -python-dateutil==2.8.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" -pyyaml==6.0; python_version >= "3.6" -requests==2.27.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -shapely==1.8.0; python_version >= "3.6" -six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" -sqlalchemy==1.4.31; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -toml==0.10.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") -typing-extensions==4.0.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6" -urllib3==1.26.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" -# utils-flask-sqlalchemy-geo==0.2.8 -utils-flask-sqlalchemy==0.2.6 -werkzeug==1.0.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.5.0" -wtforms==3.0.0; python_version >= "3.6" -xlwt==1.3.0 -zipp==3.6.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6" diff --git a/vendor/GeoNature-citizen b/vendor/GeoNature-citizen index 83a4e78..6f51f92 160000 --- a/vendor/GeoNature-citizen +++ b/vendor/GeoNature-citizen @@ -1 +1 @@ -Subproject commit 83a4e78c91be996f5a64984b2694319aea12ed97 +Subproject commit 6f51f92cf640afbef6750fd4466cc2c385f94507