undo undesirables

SkyTruth · Oct 31, 2023 · 9987a4f · 9987a4f
1 parent 3b42f42
commit 9987a4f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 19 deletions.
diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
@@ -93,7 +93,6 @@ jobs:
           stack-name: test
           comment-on-pr: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          pulumi-version: "3.91.0"
 
       - uses: pulumi/actions@v3
         env:
@@ -102,9 +101,9 @@ jobs:
         with:
           command: preview
           stack-name: test
+
           comment-on-pr: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          pulumi-version: "3.91.0"
 
   deploy-test:
     name: Deploy [TEST]
@@ -156,7 +155,6 @@ jobs:
           work-dir: images/
           command: up
           stack-name: test
-          pulumi-version: "3.91.0"
 
       # Copy shared database_client.py files
       - name: Copy Shared File
@@ -173,7 +171,6 @@ jobs:
         with:
           command: refresh
           stack-name: test
-          pulumi-version: "3.91.0"
 
       - uses: pulumi/actions@v3
         id: pulumi
@@ -183,7 +180,6 @@ jobs:
         with:
           command: up
           stack-name: test
-          pulumi-version: "3.91.0"
 
       - uses: wagnerpereira/gce-cloudsql-proxy-action@v2
         with:
@@ -230,7 +226,6 @@ jobs:
           work-dir: images/
           command: up
           stack-name: staging
-          pulumi-version: "3.91.0"
 
       # Copy shared database_client.py files
       - name: Copy Shared File
@@ -247,14 +242,12 @@ jobs:
         with:
           command: refresh
           stack-name: staging
-          pulumi-version: "3.91.0"
 
       - uses: pulumi/actions@v3
         id: pulumi
         with:
           command: up
           stack-name: staging
-          pulumi-version: "3.91.0"
 
         env:
           PULUMI_CONFIG_PASSPHRASE: "staging"
@@ -305,7 +298,6 @@ jobs:
           work-dir: images/
           command: up
           stack-name: production
-          pulumi-version: "3.91.0"
 
       # Copy shared database_client.py files
       - name: Copy Shared File
@@ -322,14 +314,12 @@ jobs:
         with:
           command: refresh
           stack-name: production
-          pulumi-version: "3.91.0"
 
       - uses: pulumi/actions@v3
         id: pulumi
         with:
           command: up
           stack-name: production
-          pulumi-version: "3.91.0"
 
         env:
           PULUMI_CONFIG_PASSPHRASE: "production"

diff --git a/alembic/versions/5e03ce584f3c_add_eez.py b/alembic/versions/5e03ce584f3c_add_eez.py
@@ -44,7 +44,6 @@ def upgrade() -> None:
     session = orm.Session(bind=bind)
 
     eez = get_eez_from_url()  # geojson.load(open("EEZ_and_HighSeas_20230410.json"))
-    eez = {"features": []}  # noqa
     for feat in eez.get("features"):
         sovereign_keys = [
             k for k in list(feat["properties"].keys()) if k.startswith("SOVEREIGN")

diff --git a/alembic/versions/c0bd1215a3ca_add_iho.py b/alembic/versions/c0bd1215a3ca_add_iho.py
@@ -36,7 +36,6 @@ def upgrade() -> None:
     session = orm.Session(bind=bind)
 
     iho = get_iho_from_url()
-    iho = {"features": []}  # noqa
     for feat in iho.get("features"):
         with session.begin():
             aoi_iho = database_schema.AoiIho(

diff --git a/alembic/versions/f9b7166c86b7_add_mpa.py b/alembic/versions/f9b7166c86b7_add_mpa.py
@@ -36,7 +36,6 @@ def upgrade() -> None:
     session = orm.Session(bind=bind)
 
     mpa = get_mpa_from_url()
-    mpa = {"features": []}  # noqa
     for feat in mpa.get("features"):
         with session.begin():
             aoi_mpa = database_schema.AoiMpa(

diff --git a/cerulean_cloud/cloud_run_orchestrator/handler.py b/cerulean_cloud/cloud_run_orchestrator/handler.py
@@ -26,8 +26,6 @@
 from fastapi.middleware.cors import CORSMiddleware
 from global_land_mask import globe
 from rasterio.io import MemoryFile
-
-# from rasterio.merge import merge
 from shapely.geometry import shape
 
 from cerulean_cloud.auth import api_key_auth
@@ -475,9 +473,8 @@ async def _orchestrate(
 
             # XXXBUG ValueError: Cannot determine common CRS for concatenation inputs, got ['WGS 84 / UTM zone 28N', 'WGS 84 / UTM zone 29N']. Use `to_crs()` to transform geometries to the same CRS before merging."
             # Example: S1A_IW_GRDH_1SDV_20230727T185101_20230727T185126_049613_05F744_1E56
-            print(f"out_fc: {out_fc}")
-            print(f"out_fc_offset: {out_fc_offset}")
-
+            print("XXXDEBUG out_fc", out_fc)
+            print("XXXDEBUG out_fc_offset", out_fc_offset)
             merged_inferences = merge_inferences(
                 out_fc,
                 out_fc_offset,