diff --git a/README.md b/README.md index a7d885fe..cb343d9a 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ account key, a string that can be [found here](https://github.com/Azure/Azurite? For example, you can set the environment variable in your terminal with: ```console -export AZURITE_ACCOUNT_KEY= +export AZURITE_ACCOUNT_KEY=$(curl -s https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite | grep "Account key:" | cut -b 24-111) ``` To set up a local environment, use: diff --git a/deployment/bin/deploy b/deployment/bin/deploy index 5e12133e..70b88e8e 100755 --- a/deployment/bin/deploy +++ b/deployment/bin/deploy @@ -210,8 +210,8 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then --set controller.service.annotations."service\.beta\.kubernetes\.io/azure-dns-label-name"="${DNS_LABEL}" \ --set controller.image.registry="mcr.microsoft.com" \ --set controller.image.image="oss/kubernetes/ingress/nginx-ingress-controller" \ - --set controller.image.tag="v1.9.6-patched" \ - --set controller.image.digest="sha256:2383717ea3edd1652b97e5b82adf15a3e7f091d0d5d0eceb8dce4410e3a6a292" \ + --set controller.image.tag="v1.11.5" \ + --set controller.image.digest="sha256:58dc07ebe8524c598137291d319a7fc0ec7f450ea43e5c22c2516c56bb7282fb" \ --version "4.8.3"\ --wait \ --timeout 2m0s \ diff --git a/pcstac/requirements-server.txt b/pcstac/requirements-server.txt index 8dd3dbef..3110bffa 100644 --- a/pcstac/requirements-server.txt +++ b/pcstac/requirements-server.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --extra=server --output-file=pcstac/requirements-server.txt ./pcstac/setup.py +# pip-compile --extra=dev --extra=server --output-file=pcstac/requirements-server.txt ./pcstac/setup.py # annotated-types==0.7.0 # via pydantic @@ -141,6 +141,8 @@ tenacity==8.1.0 # via pypgstac termcolor==2.4.0 # via fire +types-requests==2.32.0.20250328 + # via pcstac (pcstac/setup.py) typing-extensions==4.12.2 # via # anyio @@ -156,7 +158,9 @@ typing-extensions==4.12.2 tzlocal==5.2 # via dateparser urllib3==2.2.2 - # via pcstac (pcstac/setup.py) + # via + # pcstac (pcstac/setup.py) + # types-requests uvicorn[standard]==0.30.1 # via pcstac (pcstac/setup.py) uvloop==0.19.0 diff --git a/pcstac/setup.py b/pcstac/setup.py index 149354b2..956e4136 100644 --- a/pcstac/setup.py +++ b/pcstac/setup.py @@ -21,6 +21,9 @@ "server": [ "uvicorn[standard]==0.30.1", ], + "dev": [ + "types-requests" + ] } setup( diff --git a/pctiler/pctiler/endpoints/vector_tiles.py b/pctiler/pctiler/endpoints/vector_tiles.py index 9f2e8d2b..0b93b983 100644 --- a/pctiler/pctiler/endpoints/vector_tiles.py +++ b/pctiler/pctiler/endpoints/vector_tiles.py @@ -56,11 +56,11 @@ async def get_tilejson( } if tileset.bounds: - tilejson["bounds"] = tileset.bounds + tilejson["bounds"] = tileset.bounds # type: ignore if tileset.center: - tilejson["center"] = tileset.center + tilejson["center"] = tileset.center # type: ignore - return TileJSON(**tilejson) + return TileJSON(**tilejson) # type: ignore @vector_tile_router.get( diff --git a/pctiler/pctiler/reader.py b/pctiler/pctiler/reader.py index c1443541..9313aad1 100644 --- a/pctiler/pctiler/reader.py +++ b/pctiler/pctiler/reader.py @@ -153,7 +153,7 @@ def assets_for_tile( # type: ignore "zxy": f"{z}/{x}/{y}", "count": len(assets), }, - self.request, + self.request, # type: ignore ), ) return assets @@ -219,7 +219,7 @@ def _reader( "zxy": f"{tile_z}/{tile_x}/{tile_y}", "count": len(mosaic_assets), }, - self.request, + self.request, # type: ignore ), ) diff --git a/scripts/generate-requirements b/scripts/generate-requirements index 30b21a54..70ae10a7 100755 --- a/scripts/generate-requirements +++ b/scripts/generate-requirements @@ -10,7 +10,7 @@ docker compose \ -f docker-compose.dev.yml \ run --rm \ stac-dev \ - pip-compile ./pcstac/setup.py --extra server -o pcstac/requirements-server.txt $pip_compile_options + pip-compile ./pcstac/setup.py --extra server --extra dev -o pcstac/requirements-server.txt $pip_compile_options docker compose \ -f docker-compose.yml \