From fd7793d85abf1ca832a1edc574570f59a2a8a6cc Mon Sep 17 00:00:00 2001 From: Biel Stela Date: Wed, 15 May 2024 16:14:32 +0200 Subject: [PATCH] fix obsolet python version and packages --- data/Dockerfile | 2 +- data/h3_data_importer/Makefile | 1 + data/requirements.txt | 135 ++++++++++++++++++++++++++++----- 3 files changed, 120 insertions(+), 18 deletions(-) diff --git a/data/Dockerfile b/data/Dockerfile index 1969d8272..ddc8a2cf8 100644 --- a/data/Dockerfile +++ b/data/Dockerfile @@ -1,4 +1,4 @@ -FROM osgeo/gdal:ubuntu-full-3.3.3 +FROM ghcr.io/osgeo/gdal:ubuntu-full-3.8.5 LABEL maintainer="hello@vizzuality.com" ENV NODE_OPTIONS=--max_old_space_size=16384 diff --git a/data/h3_data_importer/Makefile b/data/h3_data_importer/Makefile index b1358390c..8f835bbb8 100644 --- a/data/h3_data_importer/Makefile +++ b/data/h3_data_importer/Makefile @@ -1,3 +1,4 @@ +SHELL := /bin/bash ######################### # About this var # This is a rough controller of how many parallel system threads you'll have diff --git a/data/requirements.txt b/data/requirements.txt index c3a53a49e..16cf38d33 100644 --- a/data/requirements.txt +++ b/data/requirements.txt @@ -1,17 +1,118 @@ -numpy==1.21.1 -pandas==1.3.1 -geopandas==0.10.2 -rasterio==1.3.6 -h3ronpy==0.20.1 -h3==3.7.6 -psycopg2-binary==2.9.1 -docopt==0.6.0 -tqdm==4.62.3 -jsonschema==4.6.0 -opencv-python==4.6.0.66 -requests -click==8.1.3 -rich==13.3.1 -psycopg==3.1.8 -psycopg_pool==3.1.6 -boto3==1.26 +# This file was autogenerated by uv via the following command: +# uv pip compile - -o requirements.txt +affine==2.4.0 + # via rasterio +attrs==23.2.0 + # via + # fiona + # jsonschema + # rasterio + # referencing +boto3==1.34.105 +botocore==1.34.105 + # via + # boto3 + # s3transfer +certifi==2024.2.2 + # via + # fiona + # pyproj + # rasterio + # requests +charset-normalizer==3.3.2 + # via requests +click==8.1.7 + # via + # click-plugins + # cligj + # fiona + # rasterio +click-plugins==1.1.1 + # via + # fiona + # rasterio +cligj==0.7.2 + # via + # fiona + # rasterio +docopt==0.6.2 +fiona==1.9.6 + # via geopandas +geopandas==0.14.4 +h3==3.7.7 +h3ronpy==0.16.1 +idna==3.7 + # via requests +jmespath==1.0.1 + # via + # boto3 + # botocore +jsonschema==4.22.0 +jsonschema-specifications==2023.12.1 + # via jsonschema +markdown-it-py==3.0.0 + # via rich +mdurl==0.1.2 + # via markdown-it-py +numpy==1.26.4 + # via + # geopandas + # pandas + # pyarrow + # rasterio + # shapely + # snuggs +packaging==24.0 + # via geopandas +pandas==2.2.2 + # via geopandas +psycopg==3.1.19 +psycopg-pool==3.2.2 +psycopg2-binary==2.9.9 +pyarrow==16.1.0 +pygments==2.18.0 + # via rich +pyparsing==3.1.2 + # via snuggs +pyproj==3.6.1 + # via geopandas +python-dateutil==2.9.0.post0 + # via + # botocore + # pandas +pytz==2024.1 + # via pandas +rasterio==1.3.10 +referencing==0.35.1 + # via + # jsonschema + # jsonschema-specifications +requests==2.31.0 +rich==13.7.1 +rpds-py==0.18.1 + # via + # jsonschema + # referencing +s3transfer==0.10.1 + # via boto3 +setuptools==69.5.1 + # via rasterio +shapely==2.0.4 + # via geopandas +six==1.16.0 + # via + # fiona + # python-dateutil +snuggs==1.4.7 + # via rasterio +tqdm==4.66.4 +typing-extensions==4.11.0 + # via + # psycopg + # psycopg-pool +tzdata==2024.1 + # via pandas +urllib3==2.2.1 + # via + # botocore + # requests