Merge branch 'main' into user/elay/add-function-app-to-generate-banne…

…d-ip
microsoft · Jun 12, 2024 · 1e6856e · 1e6856e
2 parents d2bdacc + 034b9c3
commit 1e6856e
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 7 deletions.
diff --git a/deployment/terraform/staging/main.tf b/deployment/terraform/staging/main.tf
@@ -9,7 +9,7 @@ module "resources" {
 
   pc_test_resources_acr = "pccomponentstest"
 
-  aks_node_count      = 2
+  aks_node_count      = 3
   stac_replica_count  = 2
   tiler_replica_count = 2
 

diff --git a/pccommon/requirements.txt b/pccommon/requirements.txt
@@ -16,7 +16,7 @@ azure-core==1.30.1
     #   opencensus-ext-azure
 azure-data-tables==12.5.0
     # via pccommon (pccommon/setup.py)
-azure-identity==1.16.0
+azure-identity==1.16.1
     # via
     #   opencensus-ext-azure
     #   pccommon (pccommon/setup.py)

diff --git a/pccommon/setup.py b/pccommon/setup.py
@@ -9,7 +9,7 @@
     "opencensus-ext-azure==1.1.13",
     "opencensus-ext-logging==0.1.1",
     "orjson>=3.10.4",
-    "azure-identity==1.16.0",
+    "azure-identity==1.16.1",
     "azure-data-tables==12.5.0",
     "azure-storage-blob>=12.20.0",
     "pydantic>=1.10, <2.0.0",

diff --git a/pcstac/setup.py b/pcstac/setup.py
@@ -11,7 +11,7 @@
     "stac-fastapi.types==2.4.8",
     "orjson==3.10.4",
     # Required due to some imports related to pypgstac CLI usage in startup script
-    "pypgstac[psycopg]~=0.7",
+    "pypgstac[psycopg]>=0.7.10,<0.8",
     "pystac==1.10.1",
 ]
 

diff --git a/pctiler/requirements-dev.txt b/pctiler/requirements-dev.txt
@@ -190,8 +190,9 @@ rasterio==1.3.10
     #   rio-tiler
     #   supermercado
     #   titiler-core
-requests==2.31.0
+requests==2.32.2
     # via
+    #   pctiler (pctiler/setup.py)
     #   planetary-computer
     #   pystac-client
 rio-tiler==4.1.13

diff --git a/pctiler/requirements-server.txt b/pctiler/requirements-server.txt
@@ -202,8 +202,9 @@ rasterio==1.3.10
     #   rio-tiler
     #   supermercado
     #   titiler-core
-requests==2.31.0
+requests==2.32.2
     # via
+    #   pctiler (pctiler/setup.py)
     #   planetary-computer
     #   pystac-client
 rio-tiler==4.1.13

diff --git a/pctiler/setup.py b/pctiler/setup.py
@@ -17,6 +17,7 @@
     "botocore==1.34.123",
     "pydantic==1.10.14",
     "idna>=3.7.0",
+    "requests==2.32.2",
     # titiler-pgstac
     "psycopg[binary,pool]",
     "titiler.pgstac==0.2.4",

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -7,6 +7,8 @@ cachetools<=4.2.
 pytest==7.*
 pytest-asyncio==0.18.*
 httpx>=0.22.0
+json-schema<4.18.0  # https://github.com/stac-utils/pystac/issues/1186
+
 pip-tools
 # Mypy types
 types-python-dateutil

diff --git a/scripts/ciauthenticate b/scripts/ciauthenticate
@@ -15,4 +15,5 @@ CI authentication for this project.
 
 # curl -sL https://aka.ms/InstallAzureCLIDeb | bash
 # az login --service-principal --username ${CLIENT_ID} --tenant "microsoft.onmicrosoft.com" --password ${CLIENT_SECRET}
-az acr login --name pccomponentstest
+az acr login --name pccomponentstest
+az acr login --name pccomponents