From c83112ee2f35c1c30dda1fec50a4cb1db8132b54 Mon Sep 17 00:00:00 2001 From: Carmen Date: Wed, 27 Apr 2022 08:38:03 +0200 Subject: [PATCH 1/4] update requirements --- requirements.txt | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4d8d3e44c..760634c97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ flask-restful-swagger-2 Flask-Cors>=3.0.3 fluent-logger>=0.9.4 google-cloud>=0.32.0 -google-cloud-bigquery>=0.28.0 +google-cloud-bigquery<=3.0.0 google-cloud-storage>=1.6.0 gunicorn>=19.9.0 joblib==0.15.1 @@ -18,7 +18,7 @@ matplotlib==3.3.4 passlib>=1.7.1 ply>=3.11 psutil>=5.7.0 -pyproj==2.6 +pyproj>=3.3.0 python-json-logger python-magic>=0.4.15 # scikit-learn @@ -33,10 +33,10 @@ wheel geopandas rasterio==1.2.10 pystac==0.5.6 - -# not yet ready for py3.8 https://github.com/pytorch/pytorch/issues/29090 -# torch -# torchvision +# required for running i.sentinel.download from GCS: +pandas +sentinelsat +tqdm # geopandas installs numpy, pandas, pyproj and Shapely as dependencies. # we keep numpy, pandas and Shapely to it but need to pin pyproj version @@ -45,17 +45,10 @@ pystac==0.5.6 # pandas # Shapely -# TODO: test because of major updates: -# Flask-1.1.1 #https://dormousehole.readthedocs.io/en/stable/CHANGES.html -# google_cloud_bigquery-1.23.0 -# Sphinx-2.2.2 -# redis-3.3.11 -# rq-1.1.0 - # TODO: remove threadpoolctl and joblib if not needed anymore for scikit-learn # google-cloud-bigquery needs libffi-dev -# required for running i.sentinel.download from GCS: -pandas -sentinelsat -tqdm +# To reactivate scikit-learn if needed: +# apk add python3 musl-dev python3-dev openblas-dev build-base +# python3 -m ensurepip && pip3 install --upgrade pip +# pip3 install scikit-learn From 2ac06ae272c9f3f85c106a2c686c76ff2da0e359 Mon Sep 17 00:00:00 2001 From: Carmen Date: Wed, 27 Apr 2022 13:35:18 +0200 Subject: [PATCH 2/4] downgrade itsdangerous --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 760634c97..e5165f094 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,6 +13,7 @@ google-cloud>=0.32.0 google-cloud-bigquery<=3.0.0 google-cloud-storage>=1.6.0 gunicorn>=19.9.0 +itsdangerous<=2.0.0 joblib==0.15.1 matplotlib==3.3.4 passlib>=1.7.1 From 62452014425f66c1fc427a0b2c0589e74c9cf39a Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 28 Apr 2022 10:37:28 +0200 Subject: [PATCH 3/4] remove itsdangerous --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e5165f094..760634c97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,6 @@ google-cloud>=0.32.0 google-cloud-bigquery<=3.0.0 google-cloud-storage>=1.6.0 gunicorn>=19.9.0 -itsdangerous<=2.0.0 joblib==0.15.1 matplotlib==3.3.4 passlib>=1.7.1 From da505c456666f7dd28a9cb635f58f53b4c9d8e17 Mon Sep 17 00:00:00 2001 From: Carmen Date: Thu, 28 Apr 2022 16:30:14 +0200 Subject: [PATCH 4/4] update requirements --- requirements.txt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 760634c97..05f0207a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,8 @@ boto3>=1.6.6 colorlog>=4.2.1 docutils==0.15 -Flask>=0.12.3 +# Flask>=0.12.3 +Flask==1.1.4 # TODO: remove when #345 is fixed Flask-HTTPAuth>=3.2.3 Flask-RESTful>=0.3.6 flask-restful-swagger-2 @@ -14,14 +15,13 @@ google-cloud-bigquery<=3.0.0 google-cloud-storage>=1.6.0 gunicorn>=19.9.0 joblib==0.15.1 +MarkupSafe==2.0.1 # TODO: remove when #345 is fixed matplotlib==3.3.4 passlib>=1.7.1 ply>=3.11 psutil>=5.7.0 -pyproj>=3.3.0 python-json-logger python-magic>=0.4.15 -# scikit-learn Sphinx>=1.7.1 threadpoolctl==2.1.0 redis>=2.10.6 @@ -45,10 +45,7 @@ tqdm # pandas # Shapely +# scikit-learn hints: +# not installed with pip, but with apk in +# actinia-docker/actinia-alpine/Dockerfile_alpine_dependencies # TODO: remove threadpoolctl and joblib if not needed anymore for scikit-learn -# google-cloud-bigquery needs libffi-dev - -# To reactivate scikit-learn if needed: -# apk add python3 musl-dev python3-dev openblas-dev build-base -# python3 -m ensurepip && pip3 install --upgrade pip -# pip3 install scikit-learn