diff --git a/api/dev_requirements.txt b/api/dev_requirements.txt index 06df5bfb..63a90367 100644 --- a/api/dev_requirements.txt +++ b/api/dev_requirements.txt @@ -4,13 +4,11 @@ # # pip-compile --no-emit-index-url dev_requirements.in # -aiocached==0.3 - # via -r requirements.txt annotated-types==0.7.0 # via # -r requirements.txt # pydantic -anyio==4.4.0 +anyio==4.7.0 # via # -r requirements.txt # httpx @@ -22,7 +20,7 @@ brotli==1.1.0 # brotli-asgi brotli-asgi==1.4.0 # via -r requirements.txt -certifi==2024.7.4 +certifi==2024.8.30 # via # httpcore # httpx @@ -30,38 +28,40 @@ click==8.1.7 # via # -r requirements.txt # uvicorn -coverage[toml]==7.6.1 - # via pytest-cov -covjson-pydantic==0.3.0 +coverage[toml]==7.6.9 + # via + # coverage + # pytest-cov +covjson-pydantic==0.5.0 # via -r requirements.txt deepdiff==7.0.1 # via -r dev_requirements.in -edr-pydantic==0.4.0 +edr-pydantic==0.5.0 # via -r requirements.txt -fastapi==0.110.3 +fastapi==0.115.6 # via -r requirements.txt -geojson-pydantic==1.1.1 +geojson-pydantic==1.1.2 # via -r requirements.txt -grpcio==1.66.1 +grpcio==1.68.1 # via # -r requirements.txt # grpcio-tools -grpcio-tools==1.66.1 +grpcio-tools==1.68.1 # via -r requirements.txt -gunicorn==22.0.0 +gunicorn==23.0.0 # via -r requirements.txt h11==0.14.0 # via # -r requirements.txt # httpcore # uvicorn -httpcore==1.0.5 +httpcore==1.0.7 # via httpx -httptools==0.6.1 +httptools==0.6.4 # via # -r requirements.txt # uvicorn -httpx==0.27.0 +httpx==0.27.2 # via -r dev_requirements.in idna==3.10 # via @@ -70,49 +70,49 @@ idna==3.10 # httpx iniconfig==2.0.0 # via pytest -isodate==0.6.1 +isodate==0.7.2 # via -r requirements.txt jinja2==3.1.4 # via -r requirements.txt -markupsafe==2.1.5 +markupsafe==3.0.2 # via # -r requirements.txt # jinja2 -numpy==2.1.1 +numpy==2.2.0 # via # -r requirements.txt # shapely ordered-set==4.1.0 # via deepdiff -packaging==24.1 +packaging==24.2 # via # -r requirements.txt # gunicorn # pytest pluggy==1.5.0 # via pytest -prometheus-client==0.20.0 +prometheus-client==0.21.1 # via # -r requirements.txt # prometheus-fastapi-instrumentator prometheus-fastapi-instrumentator==7.0.0 # via -r requirements.txt -protobuf==5.28.1 +protobuf==5.29.1 # via # -r requirements.txt # grpcio-tools -pydantic==2.9.1 +pydantic==2.10.3 # via # -r requirements.txt # covjson-pydantic # edr-pydantic # fastapi # geojson-pydantic -pydantic-core==2.23.3 +pydantic-core==2.27.1 # via # -r requirements.txt # pydantic -pytest==8.3.2 +pytest==8.3.4 # via # -r dev_requirements.in # pytest-cov @@ -131,16 +131,12 @@ pyyaml==6.0.2 # uvicorn shapely==2.0.6 # via -r requirements.txt -six==1.16.0 - # via - # -r requirements.txt - # isodate sniffio==1.3.1 # via # -r requirements.txt # anyio # httpx -starlette==0.37.2 +starlette==0.41.3 # via # -r requirements.txt # brotli-asgi @@ -149,20 +145,23 @@ starlette==0.37.2 typing-extensions==4.12.2 # via # -r requirements.txt + # anyio # fastapi # pydantic # pydantic-core -uvicorn[standard]==0.29.0 - # via -r requirements.txt -uvloop==0.20.0 +uvicorn[standard]==0.32.1 + # via + # -r requirements.txt + # uvicorn +uvloop==0.21.0 # via # -r requirements.txt # uvicorn -watchfiles==0.24.0 +watchfiles==1.0.0 # via # -r requirements.txt # uvicorn -websockets==13.0.1 +websockets==14.1 # via # -r requirements.txt # uvicorn diff --git a/api/formatters/covjson.py b/api/formatters/covjson.py index f4036bdb..2f3406f5 100644 --- a/api/formatters/covjson.py +++ b/api/formatters/covjson.py @@ -11,7 +11,7 @@ from covjson_pydantic.domain import Domain from covjson_pydantic.domain import DomainType from covjson_pydantic.domain import ValuesAxis -from covjson_pydantic.ndarray import NdArray +from covjson_pydantic.ndarray import NdArrayFloat from covjson_pydantic.observed_property import ObservedProperty from covjson_pydantic.parameter import Parameter from covjson_pydantic.reference_system import ReferenceSystem @@ -95,7 +95,7 @@ def convert_to_covjson(observations): parameter_id = data.ts_mdata.parameter_name parameters[parameter_id] = make_parameter(data.ts_mdata) - ranges[parameter_id] = NdArray( + ranges[parameter_id] = NdArrayFloat( values=values_no_nan, axisNames=["t", "y", "x"], shape=[len(values_no_nan), 1, 1] ) diff --git a/api/requirements.in b/api/requirements.in index c882648c..e796d3da 100644 --- a/api/requirements.in +++ b/api/requirements.in @@ -5,14 +5,13 @@ grpcio-tools~=1.62 brotli-asgi~=1.4 -fastapi~=0.110.2 -gunicorn~=22.0 -uvicorn[standard]~=0.29.0 -covjson-pydantic~=0.3.0 -edr-pydantic~=0.4.0 +fastapi~=0.115.6 +gunicorn~=23.0 +uvicorn[standard]~=0.32.1 +covjson-pydantic~=0.5.0 +edr-pydantic~=0.5.0 shapely~=2.0 geojson-pydantic~=1.0 -aiocached~=0.3.0 jinja2~=3.1 -isodate~=0.6.1 +isodate~=0.7.2 prometheus-fastapi-instrumentator~=7.0.0 diff --git a/api/requirements.txt b/api/requirements.txt index e6b38f35..f98c3582 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -2,13 +2,11 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-emit-index-url --output-file=requirements.txt +# pip-compile --no-emit-index-url requirements.in # -aiocached==0.3 - # via -r requirements.in annotated-types==0.7.0 # via pydantic -anyio==4.4.0 +anyio==4.7.0 # via # starlette # watchfiles @@ -18,49 +16,49 @@ brotli-asgi==1.4.0 # via -r requirements.in click==8.1.7 # via uvicorn -covjson-pydantic==0.3.0 +covjson-pydantic==0.5.0 # via -r requirements.in -edr-pydantic==0.4.0 +edr-pydantic==0.5.0 # via -r requirements.in -fastapi==0.110.3 +fastapi==0.115.6 # via -r requirements.in -geojson-pydantic==1.1.1 +geojson-pydantic==1.1.2 # via -r requirements.in -grpcio==1.66.1 +grpcio==1.68.1 # via grpcio-tools -grpcio-tools==1.66.1 +grpcio-tools==1.68.1 # via -r requirements.in -gunicorn==22.0.0 +gunicorn==23.0.0 # via -r requirements.in h11==0.14.0 # via uvicorn -httptools==0.6.1 +httptools==0.6.4 # via uvicorn idna==3.10 # via anyio -isodate==0.6.1 +isodate==0.7.2 # via -r requirements.in jinja2==3.1.4 # via -r requirements.in -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 -numpy==2.1.1 +numpy==2.2.0 # via shapely -packaging==24.1 +packaging==24.2 # via gunicorn -prometheus-client==0.20.0 +prometheus-client==0.21.1 # via prometheus-fastapi-instrumentator prometheus-fastapi-instrumentator==7.0.0 # via -r requirements.in -protobuf==5.28.1 +protobuf==5.29.1 # via grpcio-tools -pydantic==2.9.1 +pydantic==2.10.3 # via # covjson-pydantic # edr-pydantic # fastapi # geojson-pydantic -pydantic-core==2.23.3 +pydantic-core==2.27.1 # via pydantic python-dotenv==1.0.1 # via uvicorn @@ -68,27 +66,28 @@ pyyaml==6.0.2 # via uvicorn shapely==2.0.6 # via -r requirements.in -six==1.16.0 - # via isodate sniffio==1.3.1 # via anyio -starlette==0.37.2 +starlette==0.41.3 # via # brotli-asgi # fastapi # prometheus-fastapi-instrumentator typing-extensions==4.12.2 # via + # anyio # fastapi # pydantic # pydantic-core -uvicorn[standard]==0.29.0 - # via -r requirements.in -uvloop==0.20.0 +uvicorn[standard]==0.32.1 + # via + # -r requirements.in + # uvicorn +uvloop==0.21.0 # via uvicorn -watchfiles==0.24.0 +watchfiles==1.0.0 # via uvicorn -websockets==13.0.1 +websockets==14.1 # via uvicorn # The following packages are considered to be unsafe in a requirements file: diff --git a/datastore/data-loader/requirements.txt b/datastore/data-loader/requirements.txt index 024b7e4d..faae70dc 100644 --- a/datastore/data-loader/requirements.txt +++ b/datastore/data-loader/requirements.txt @@ -2,37 +2,37 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-emit-index-url +# pip-compile --no-emit-index-url requirements.in # certifi==2024.8.30 # via # netcdf4 # requests -cftime==1.6.4 +cftime==1.6.4.post1 # via netcdf4 charset-normalizer==3.4.0 # via requests -grpcio==1.67.0 +grpcio==1.68.1 # via grpcio-tools -grpcio-tools==1.67.0 +grpcio-tools==1.68.1 # via -r requirements.in idna==3.10 # via requests isodate==0.6.1 # via -r requirements.in -netcdf4==1.7.1.post2 +netcdf4==1.7.2 # via -r requirements.in -numpy==2.1.2 +numpy==2.2.0 # via # cftime # netcdf4 # pandas # xarray -packaging==24.1 +packaging==24.2 # via xarray pandas==2.2.3 # via xarray -protobuf==5.28.2 +protobuf==5.29.1 # via grpcio-tools python-dateutil==2.9.0.post0 # via pandas @@ -40,7 +40,7 @@ pytz==2024.2 # via pandas requests==2.32.3 # via -r requirements.in -six==1.16.0 +six==1.17.0 # via # isodate # python-dateutil diff --git a/datastore/examples/clients/python/requirements.txt b/datastore/examples/clients/python/requirements.txt index 9edb9db0..2d1547e0 100644 --- a/datastore/examples/clients/python/requirements.txt +++ b/datastore/examples/clients/python/requirements.txt @@ -2,13 +2,13 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-emit-index-url ./requirements.in +# pip-compile --no-emit-index-url requirements.in # -grpcio==1.62.2 +grpcio==1.68.1 # via grpcio-tools -grpcio-tools==1.62.2 - # via -r ./requirements.in -protobuf==4.25.3 +grpcio-tools==1.68.1 + # via -r requirements.in +protobuf==5.29.1 # via grpcio-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/datastore/integration-test/requirements.txt b/datastore/integration-test/requirements.txt index eb4733fa..d3bbab68 100644 --- a/datastore/integration-test/requirements.txt +++ b/datastore/integration-test/requirements.txt @@ -2,35 +2,35 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-emit-index-url ./requirements.in +# pip-compile --no-emit-index-url requirements.in # -certifi==2024.2.2 +certifi==2024.8.30 # via requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests deepdiff==6.7.1 - # via -r ./requirements.in -grpcio==1.62.2 + # via -r requirements.in +grpcio==1.68.1 # via grpcio-tools -grpcio-tools==1.62.2 - # via -r ./requirements.in -idna==3.7 +grpcio-tools==1.68.1 + # via -r requirements.in +idna==3.10 # via requests iniconfig==2.0.0 # via pytest ordered-set==4.1.0 # via deepdiff -packaging==24.0 +packaging==24.2 # via pytest pluggy==1.5.0 # via pytest -protobuf==4.25.3 +protobuf==5.29.1 # via grpcio-tools pytest==7.4.4 - # via -r ./requirements.in -requests==2.31.0 - # via -r ./requirements.in -urllib3==2.2.1 + # via -r requirements.in +requests==2.32.3 + # via -r requirements.in +urllib3==2.2.3 # via requests # The following packages are considered to be unsafe in a requirements file: diff --git a/datastore/load-test/requirements.txt b/datastore/load-test/requirements.txt index fdc2e203..19f31202 100644 --- a/datastore/load-test/requirements.txt +++ b/datastore/load-test/requirements.txt @@ -2,95 +2,89 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --no-emit-index-url ./requirements.in +# pip-compile --no-emit-index-url requirements.in # -apscheduler==3.10.4 - # via -r ./requirements.in -blinker==1.7.0 +apscheduler==3.11.0 + # via -r requirements.in +blinker==1.9.0 # via flask brotli==1.1.0 # via geventhttpclient -certifi==2024.2.2 +certifi==2024.8.30 # via # geventhttpclient # requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via flask configargparse==1.7 # via locust -flask==3.0.3 +flask==3.1.0 # via # flask-cors # flask-login # locust -flask-cors==4.0.0 +flask-cors==5.0.0 # via locust flask-login==0.6.3 # via locust -gevent==24.2.1 +gevent==24.11.1 # via # geventhttpclient # locust -geventhttpclient==2.2.1 +geventhttpclient==2.3.3 # via locust -greenlet==3.0.3 +greenlet==3.1.1 # via gevent grpc-interceptor==0.15.4 - # via -r ./requirements.in -grpcio==1.62.2 + # via -r requirements.in +grpcio==1.68.1 # via # grpc-interceptor # grpcio-tools -grpcio-tools==1.62.2 - # via -r ./requirements.in -idna==3.7 +grpcio-tools==1.68.1 + # via -r requirements.in +idna==3.10 # via requests itsdangerous==2.2.0 # via flask -jinja2==3.1.3 +jinja2==3.1.4 # via flask -locust==2.26.0 - # via -r ./requirements.in -markupsafe==2.1.5 +locust==2.32.4 + # via -r requirements.in +markupsafe==3.0.2 # via # jinja2 # werkzeug -msgpack==1.0.8 +msgpack==1.1.0 # via locust -numpy==1.26.4 +numpy==2.2.0 # via shapely -protobuf==4.25.3 +protobuf==5.29.1 # via grpcio-tools -psutil==5.9.8 +psutil==6.1.0 # via locust -pytz==2024.1 - # via apscheduler -pyzmq==26.0.2 - # via locust -requests==2.31.0 +pyzmq==26.2.0 # via locust -roundrobin==0.0.4 +requests==2.32.3 # via locust -shapely==2.0.4 - # via -r ./requirements.in -six==1.16.0 - # via apscheduler +shapely==2.0.6 + # via -r requirements.in tzlocal==5.2 # via apscheduler -urllib3==2.2.1 +urllib3==2.2.3 # via # geventhttpclient # requests -werkzeug==3.0.2 +werkzeug==3.1.3 # via # flask # flask-login # locust zope-event==5.0 # via gevent -zope-interface==6.3 +zope-interface==7.2 # via gevent # The following packages are considered to be unsafe in a requirements file: