From ce085257344bf70242b96b89221ac204bf7eabad Mon Sep 17 00:00:00 2001 From: Sai Ma Date: Thu, 14 Oct 2021 23:42:42 +0000 Subject: [PATCH 1/2] Update odc-stats docker image to 0.3.46 --- statistician/constraints.txt | 142 ---------------------------------- statistician/requirements.txt | 20 ++--- statistician/version.txt | 2 +- 3 files changed, 12 insertions(+), 152 deletions(-) diff --git a/statistician/constraints.txt b/statistician/constraints.txt index 6e87f47d..e69de29b 100644 --- a/statistician/constraints.txt +++ b/statistician/constraints.txt @@ -1,142 +0,0 @@ -affine==2.3.0 -aiobotocore==1.3.3 -aiohttp==3.7.4.post0 -aioitertools==0.8.0 -appdirs==1.4.4 -astropy==4.3.1 -async-timeout==3.0.1 -attrs==21.2.0 -awscli==1.19.106 -Babel==2.9.1 -blinker==1.4 -boltons==21.0.0 -boto3==1.17.106 -botocore==1.20.106 -Bottleneck==1.3.2 -cachetools==4.2.4 -cattrs==1.8.0 -certifi==2021.5.30 -cftime==1.5.1 -chardet==4.0.0 -charset-normalizer==2.0.6 -ciso8601==2.2.0 -click==8.0.1 -click-plugins==1.1.1 -cligj==0.7.2 -cloudpickle==2.0.0 -colorama==0.4.3 -colour==0.1.5 -cycler==0.10.0 -dask==2021.9.1 -dask-image==0.6.0 -datacube==1.8.6 -datacube-ows==1.8.20 -deepdiff==5.5.0 -defusedxml==0.7.1 -distributed==2021.9.1 -docutils==0.15.2 -eodatasets3==0.22.2 -Flask==2.0.2 -Flask-Babel==2.0.0 -Flask-Log-Request-ID==0.10.1 -fsspec==2021.7.0 -GeoAlchemy2==0.9.4 -greenlet==1.1.2 -hdstats==0.1.8.post1 -HeapDict==1.0.1 -idna==3.2 -imageio==2.9.0 -importlib-resources==5.2.2 -iso8601==0.1.16 -itsdangerous==2.0.1 -Jinja2==3.0.2 -jmespath==0.10.0 -jsonschema==4.0.1 -kiwisolver==1.3.2 -lark-parser==0.12.0 -lmdb==1.2.1 -locket==0.2.1 -lxml==4.6.3 -MarkupSafe==2.0.1 -matplotlib==3.4.3 -morecantile==3.0.0 -msgpack==1.0.2 -multidict==5.2.0 -netCDF4==1.5.7 -networkx==2.6.3 -numexpr==2.7.3 -numpy==1.21.2 -odc-algo==0.2.1.dev3056 -odc-apps-cloud==0.2.1.dev3056 -odc-apps-dc-tools==0.2.1.dev3056 -odc-cloud==0.2.1.dev3056 -odc-dscache==0.2.1.dev3056 -odc-io==0.2.1.dev3056 -odc-stac==0.2.1.dev3056 -odc-stats==1.0.1.dev3056 -ordered-set==4.0.2 -packaging==21.0 -pandas==1.3.3 -partd==1.2.0 -Pillow==8.3.2 -PIMS==0.5 -pkg_resources==0.0.0 -prometheus-client==0.11.0 -prometheus-flask-exporter==0.18.3 -psutil==5.8.0 -psycopg2==2.9.1 -pyasn1==0.4.8 -pydantic==1.8.2 -pyerfa==2.0.0 -pyows==0.2.4 -pyparsing==2.4.7 -pyproj==3.2.1 -pyrsistent==0.18.0 -pystac==1.1.0 -pystac-client==0.3.0 -python-dateutil==2.8.2 -python-rapidjson==1.4 -python-slugify==5.0.2 -pytz==2021.3 -PyWavelets==1.1.1 -PyYAML==5.4.1 -rasterio==1.2.9 -regex==2021.9.30 -requests==2.26.0 -requests-cache==0.8.1 -rio-cogeo==3.0.0 -rio-stac==0.3.1 -rsa==4.7.2 -ruamel.yaml==0.17.16 -ruamel.yaml.clib==0.2.6 -s3fs==2021.7.0 -s3transfer==0.4.2 -scikit-image==0.18.3 -scipy==1.7.1 -sentry-sdk==1.4.3 -setuptools-scm==6.3.2 -Shapely==1.7.1 -six==1.16.0 -slicerator==1.0.0 -snuggs==1.4.7 -sortedcontainers==2.4.0 -SQLAlchemy==1.4.25 -structlog==21.1.0 -tblib==1.7.0 -text-unidecode==1.3 -tifffile==2021.8.30 -timezonefinderL==4.0.2 -tomli==1.2.1 -toolz==0.11.1 -tornado==6.1 -tqdm==4.62.3 -typing-extensions==3.10.0.2 -url-normalize==1.4.3 -urllib3==1.26.7 -Werkzeug==2.0.2 -wrapt==1.13.1 -xarray==0.19.0 -yarl==1.7.0 -zict==2.0.0 -zipp==3.6.0 -zstandard==0.15.2 \ No newline at end of file diff --git a/statistician/requirements.txt b/statistician/requirements.txt index da2db162..7d7eb3bd 100644 --- a/statistician/requirements.txt +++ b/statistician/requirements.txt @@ -2,15 +2,17 @@ rio-cogeo datacube[performance,s3]==1.8.6 aiobotocore[awscli,boto3]==1.3.3 +# odc-stac is in PyPI +odc-stac==0.2.0a9 + --extra-index-url https://packages.dea.ga.gov.au/ hdstats==0.1.8.post1 -odc-algo==0.2.1.dev3056 -odc-apps-cloud==0.2.1.dev3056 -odc-apps-dc-tools==0.2.1.dev3056 -odc-cloud==0.2.1.dev3056 -odc-dscache==0.2.1.dev3056 -odc-io==0.2.1.dev3056 -odc-stac==0.2.1.dev3056 -odc-stats[ows]==1.0.1.dev3056 +odc-algo==0.2.1.dev3083 +odc-apps-cloud==0.2.1.dev3083 +odc-apps-dc-tools==0.2.1.dev3083 +odc-cloud==0.2.1.dev3083 +odc-dscache==0.2.1.dev3083 +odc-io==0.2.1.dev3083 +odc-stats[ows]==1.0.2.dev3083 # For testing -odc-apps-dc-tools==0.2.1.dev3056 +odc-apps-dc-tools==0.2.1.dev3083 diff --git a/statistician/version.txt b/statistician/version.txt index 5d8b11af..b9c7814c 100644 --- a/statistician/version.txt +++ b/statistician/version.txt @@ -1 +1 @@ -0.3.45 +0.3.46 From 785f2cce0d979be1e4645bcdbc68755095b0b7fd Mon Sep 17 00:00:00 2001 From: Sai Ma Date: Thu, 14 Oct 2021 23:45:01 +0000 Subject: [PATCH 2/2] Add the constraints back --- statistician/constraints.txt | 142 +++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/statistician/constraints.txt b/statistician/constraints.txt index e69de29b..b07d2d70 100644 --- a/statistician/constraints.txt +++ b/statistician/constraints.txt @@ -0,0 +1,142 @@ +affine==2.3.0 +aiobotocore==1.3.3 +aiohttp==3.7.4.post0 +aioitertools==0.8.0 +appdirs==1.4.4 +astropy==4.3.1 +async-timeout==3.0.1 +attrs==21.2.0 +awscli==1.19.106 +Babel==2.9.1 +blinker==1.4 +boltons==21.0.0 +boto3==1.17.106 +botocore==1.20.106 +Bottleneck==1.3.2 +cachetools==4.2.4 +cattrs==1.8.0 +certifi==2021.10.8 +cftime==1.5.1 +chardet==4.0.0 +charset-normalizer==2.0.7 +ciso8601==2.2.0 +click==8.0.3 +click-plugins==1.1.1 +cligj==0.7.2 +cloudpickle==2.0.0 +colorama==0.4.3 +colour==0.1.5 +cycler==0.10.0 +dask==2021.9.1 +dask-image==0.6.0 +datacube==1.8.6 +datacube-ows==1.8.20 +deepdiff==5.6.0 +defusedxml==0.7.1 +distributed==2021.9.1 +docutils==0.15.2 +eodatasets3==0.22.2 +Flask==2.0.2 +Flask-Babel==2.0.0 +Flask-Log-Request-ID==0.10.1 +fsspec==2021.7.0 +GeoAlchemy2==0.9.4 +greenlet==1.1.2 +hdstats==0.1.8.post1 +HeapDict==1.0.1 +idna==3.3 +imageio==2.9.0 +importlib-resources==5.2.2 +iso8601==0.1.16 +itsdangerous==2.0.1 +Jinja2==3.0.2 +jmespath==0.10.0 +jsonschema==4.1.0 +kiwisolver==1.3.2 +lark-parser==0.12.0 +lmdb==1.2.1 +locket==0.2.1 +lxml==4.6.3 +MarkupSafe==2.0.1 +matplotlib==3.4.3 +morecantile==3.0.0 +msgpack==1.0.2 +multidict==5.2.0 +netCDF4==1.5.7 +networkx==2.6.3 +numexpr==2.7.3 +numpy==1.21.2 +odc-algo==0.2.1.dev3083 +odc-apps-cloud==0.2.1.dev3083 +odc-apps-dc-tools==0.2.1.dev3083 +odc-cloud==0.2.1.dev3083 +odc-dscache==0.2.1.dev3083 +odc-io==0.2.1.dev3083 +odc-stac==0.2.0a9 +odc-stats==1.0.2.dev3083 +ordered-set==4.0.2 +packaging==21.0 +pandas==1.3.3 +partd==1.2.0 +Pillow==8.3.2 +PIMS==0.5 +pkg_resources==0.0.0 +prometheus-client==0.11.0 +prometheus-flask-exporter==0.18.3 +psutil==5.8.0 +psycopg2==2.9.1 +pyasn1==0.4.8 +pydantic==1.8.2 +pyerfa==2.0.0 +pyows==0.2.4 +pyparsing==2.4.7 +pyproj==3.2.1 +pyrsistent==0.18.0 +pystac==1.1.0 +pystac-client==0.3.0 +python-dateutil==2.8.2 +python-rapidjson==1.4 +python-slugify==5.0.2 +pytz==2021.3 +PyWavelets==1.1.1 +PyYAML==5.4.1 +rasterio==1.2.10 +regex==2021.10.8 +requests==2.26.0 +requests-cache==0.8.1 +rio-cogeo==3.0.0 +rio-stac==0.3.1 +rsa==4.7.2 +ruamel.yaml==0.17.16 +ruamel.yaml.clib==0.2.6 +s3fs==2021.7.0 +s3transfer==0.4.2 +scikit-image==0.18.3 +scipy==1.7.1 +sentry-sdk==1.4.3 +setuptools-scm==6.3.2 +Shapely==1.7.1 +six==1.16.0 +slicerator==1.0.0 +snuggs==1.4.7 +sortedcontainers==2.4.0 +SQLAlchemy==1.4.25 +structlog==21.2.0 +tblib==1.7.0 +text-unidecode==1.3 +tifffile==2021.10.12 +timezonefinderL==4.0.2 +tomli==1.2.1 +toolz==0.11.1 +tornado==6.1 +tqdm==4.62.3 +typing-extensions==3.10.0.2 +url-normalize==1.4.3 +urllib3==1.26.7 +Werkzeug==2.0.2 +wrapt==1.13.2 +xarray==0.19.0 +yarl==1.7.0 +zict==2.0.0 +zipp==3.6.0 +zstandard==0.15.2 \ No newline at end of file