From 5fae21633087e70af05f599d3ae457ddfa8f8113 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Fri, 7 Jun 2024 19:11:07 -0400 Subject: [PATCH 01/14] Upgrade to GDAL 3.9.0 --- batch/gdal-python.dockerfile | 2 +- batch/pixetl.dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/batch/gdal-python.dockerfile b/batch/gdal-python.dockerfile index 8030a8c8c..7f8362166 100644 --- a/batch/gdal-python.dockerfile +++ b/batch/gdal-python.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-gdal:v1.1.11 +FROM globalforestwatch/data-api-gdal:v1.2.0 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ diff --git a/batch/pixetl.dockerfile b/batch/pixetl.dockerfile index 5c495adde..6c7f44fc3 100644 --- a/batch/pixetl.dockerfile +++ b/batch/pixetl.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/pixetl:v1.7.6 +FROM globalforestwatch/pixetl:v1.7.7 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ From e20cbbba7b4ed4937ba9001349e764d461ea9ec4 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Sat, 8 Jun 2024 09:21:46 -0400 Subject: [PATCH 02/14] Use the venv created in pixetl image --- batch/pixetl.dockerfile | 2 +- batch/scripts/apply_colormap.sh | 2 +- batch/scripts/resample.sh | 2 +- batch/scripts/run_pixetl.sh | 2 +- batch/scripts/run_pixetl_prep.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/batch/pixetl.dockerfile b/batch/pixetl.dockerfile index 6c7f44fc3..a774b7a18 100644 --- a/batch/pixetl.dockerfile +++ b/batch/pixetl.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/pixetl:v1.7.7 +FROM globalforestwatch/pixetl:v1.7.7b # Copy scripts COPY ./batch/scripts/ /opt/scripts/ diff --git a/batch/scripts/apply_colormap.sh b/batch/scripts/apply_colormap.sh index c00de3c56..52ebead94 100644 --- a/batch/scripts/apply_colormap.sh +++ b/batch/scripts/apply_colormap.sh @@ -27,4 +27,4 @@ ARG_ARRAY+=("--source-uri" "${SRC}") ARG_ARRAY+=("--target-prefix" "${TARGET}") # Run apply_symbology.py with the array of arguments -apply_colormap.py "${ARG_ARRAY[@]}" \ No newline at end of file +. /usr/local/app/.venv/bin/activate && pipenv run apply_colormap.py "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/resample.sh b/batch/scripts/resample.sh index 7ecdc0557..6e9e3ee17 100644 --- a/batch/scripts/resample.sh +++ b/batch/scripts/resample.sh @@ -27,4 +27,4 @@ ARG_ARRAY+=("--target-zoom" "${ZOOM_LEVEL}") ARG_ARRAY+=("--target-prefix" "${TARGET}") # Run resample.py with the array of arguments -resample.py "${ARG_ARRAY[@]}" \ No newline at end of file +. /usr/local/app/.venv/bin/activate && pipenv run resample.py "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/run_pixetl.sh b/batch/scripts/run_pixetl.sh index 6fbb6ab7a..2fb286688 100644 --- a/batch/scripts/run_pixetl.sh +++ b/batch/scripts/run_pixetl.sh @@ -35,4 +35,4 @@ fi ARG_ARRAY+=("${JSON}") # Run pixetl with the array of arguments -pixetl "${ARG_ARRAY[@]}" \ No newline at end of file +. /usr/local/app/.venv/bin/activate && pipenv run pixetl "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/run_pixetl_prep.sh b/batch/scripts/run_pixetl_prep.sh index 7dbd5167c..daeca0e14 100644 --- a/batch/scripts/run_pixetl_prep.sh +++ b/batch/scripts/run_pixetl_prep.sh @@ -30,4 +30,4 @@ if [ -z "${OVERWRITE}" ]; then fi # Run pixetl_prep with the array of arguments -pixetl_prep "${ARG_ARRAY[@]}" \ No newline at end of file +. /usr/local/app/.venv/bin/activate && pipenv run pixetl_prep "${ARG_ARRAY[@]}" \ No newline at end of file From 1936ce0c09cf6b03b4f30fd98c73785d51ee7713 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Mon, 10 Jun 2024 11:21:34 -0400 Subject: [PATCH 03/14] Tweak pixetl Docker image --- batch/pixetl.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batch/pixetl.dockerfile b/batch/pixetl.dockerfile index a774b7a18..fdd77939f 100644 --- a/batch/pixetl.dockerfile +++ b/batch/pixetl.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/pixetl:v1.7.7b +FROM globalforestwatch/pixetl:v1.7.7c # Copy scripts COPY ./batch/scripts/ /opt/scripts/ From 00ccf7c54a4836151c22fac17ec6ff53e05e71a6 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Mon, 10 Jun 2024 15:07:54 -0400 Subject: [PATCH 04/14] Smarten-up vector sources test --- tests/tasks/test_vector_source_assets.py | 275 ++++++++--------------- 1 file changed, 98 insertions(+), 177 deletions(-) diff --git a/tests/tasks/test_vector_source_assets.py b/tests/tasks/test_vector_source_assets.py index d9ffbca04..a5e88c3be 100644 --- a/tests/tasks/test_vector_source_assets.py +++ b/tests/tasks/test_vector_source_assets.py @@ -154,184 +154,105 @@ async def test_vector_source_asset(batch_client, async_client: AsyncClient): # Fields response = await async_client.get(f"/dataset/{dataset}/{version}/fields") assert response.status_code == 200 + + expected_fields = [ + { + "name": "gfw_fid", + "alias": "gfw_fid", + "description": None, + "data_type": "integer", + "is_feature_info": True, + "is_filter": True, + "unit": None, + }, + { + "name": "geom", + "alias": "geom", + "description": None, + "data_type": "geometry", + "is_feature_info": False, + "is_filter": False, + "unit": None, + }, + { + "name": "geom_wm", + "alias": "geom_wm", + "description": None, + "data_type": "geometry", + "is_feature_info": False, + "is_filter": False, + "unit": None, + }, + { + "name": "gfw_area__ha", + "alias": "gfw_area__ha", + "description": None, + "data_type": "numeric", + "is_feature_info": True, + "is_filter": True, + "unit": None, + }, + { + "name": "gfw_geostore_id", + "alias": "gfw_geostore_id", + "description": None, + "data_type": "uuid", + "is_feature_info": True, + "is_filter": True, + "unit": None, + }, + { + "name": "gfw_geojson", + "alias": "gfw_geojson", + "description": None, + "data_type": "text", + "is_feature_info": False, + "is_filter": False, + "unit": None, + }, + { + "name": "gfw_bbox", + "alias": "gfw_bbox", + "description": None, + "data_type": "ARRAY", + "is_feature_info": False, + "is_filter": False, + "unit": None, + }, + { + "name": "created_on", + "alias": "created_on", + "description": None, + "data_type": "timestamp without time zone", + "is_feature_info": False, + "is_filter": False, + "unit": None, + }, + { + "name": "updated_on", + "alias": "updated_on", + "description": None, + "data_type": "timestamp without time zone", + "is_feature_info": False, + "is_filter": False, + "unit": None, + }, + ] if i == 0: - assert response.json()["data"] == [ - { - "name": "gfw_fid", - "alias": "gfw_fid", - "description": None, - "data_type": "integer", - "is_feature_info": True, - "is_filter": True, - "unit": None, - }, - { - "name": "fid", - "alias": "fid", - "description": None, - "data_type": "numeric", - "is_feature_info": True, - "is_filter": True, - "unit": None, - }, - { - "name": "geom", - "alias": "geom", - "description": None, - "data_type": "geometry", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "geom_wm", - "alias": "geom_wm", - "description": None, - "data_type": "geometry", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "gfw_area__ha", - "alias": "gfw_area__ha", - "description": None, - "data_type": "numeric", - "is_feature_info": True, - "is_filter": True, - "unit": None, - }, - { - "name": "gfw_geostore_id", - "alias": "gfw_geostore_id", - "description": None, - "data_type": "uuid", - "is_feature_info": True, - "is_filter": True, - "unit": None, - }, - { - "name": "gfw_geojson", - "alias": "gfw_geojson", - "description": None, - "data_type": "text", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "gfw_bbox", - "alias": "gfw_bbox", - "description": None, - "data_type": "ARRAY", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "created_on", - "alias": "created_on", - "description": None, - "data_type": "timestamp without time zone", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "updated_on", - "alias": "updated_on", - "description": None, - "data_type": "timestamp without time zone", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - ] - else: - # JSON file does not have fid field - assert response.json()["data"] == [ - { - "name": "gfw_fid", - "alias": "gfw_fid", - "description": None, - "data_type": "integer", - "is_feature_info": True, - "is_filter": True, - "unit": None, - }, - { - "name": "geom", - "alias": "geom", - "description": None, - "data_type": "geometry", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "geom_wm", - "alias": "geom_wm", - "description": None, - "data_type": "geometry", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "gfw_area__ha", - "alias": "gfw_area__ha", - "description": None, - "data_type": "numeric", - "is_feature_info": True, - "is_filter": True, - "unit": None, - }, - { - "name": "gfw_geostore_id", - "alias": "gfw_geostore_id", - "description": None, - "data_type": "uuid", - "is_feature_info": True, - "is_filter": True, - "unit": None, - }, - { - "name": "gfw_geojson", - "alias": "gfw_geojson", - "description": None, - "data_type": "text", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "gfw_bbox", - "alias": "gfw_bbox", - "description": None, - "data_type": "ARRAY", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "created_on", - "alias": "created_on", - "description": None, - "data_type": "timestamp without time zone", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - { - "name": "updated_on", - "alias": "updated_on", - "description": None, - "data_type": "timestamp without time zone", - "is_feature_info": False, - "is_filter": False, - "unit": None, - }, - ] + expected_fields.append({ + "name": "fid", + "alias": "fid", + "description": None, + "data_type": "numeric", + "is_feature_info": True, + "is_filter": True, + "unit": None, + }) + + fields = response.json()["data"] + assert len(fields) == len(expected_fields) + for field in expected_fields: + assert field in fields httpx.delete(f"http://localhost:{PORT}") From ccc132322de69e382e8ff03c952e04e67f77a425 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Mon, 10 Jun 2024 15:18:08 -0400 Subject: [PATCH 05/14] Upgrade PostGIS to that in AWS --- docker-compose.dev.yml | 2 +- docker-compose.prod.yml | 2 +- docker-compose.test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index e52b6d8a7..8a60157cf 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -61,7 +61,7 @@ services: database_12: container_name: gfw-data-api-database_12 - image: postgis/postgis:12-2.5-alpine + image: postgis/postgis:12-3.3-alpine restart: on-failure ports: - 54320:5432 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 1be3844a5..0f764358a 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -46,7 +46,7 @@ services: database: container_name: gfw-data-api-database - image: postgis/postgis:12-2.5-alpine + image: postgis/postgis:12-3.3-alpine restart: on-failure ports: - 54320:5432 diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 755cb7307..c400bc411 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -71,7 +71,7 @@ services: test_database_12: container_name: gfw-data-api-test-database-12 - image: postgis/postgis:12-2.5-alpine + image: postgis/postgis:12-3.3-alpine ports: - 54321:5432 environment: From 8999dd42f7adbc552cdd3cf76b3ed30174ec5bd6 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Tue, 18 Jun 2024 10:26:36 -0400 Subject: [PATCH 06/14] Settle on (the as-yet-unreleased) pixetl 1.7.7 --- batch/pixetl.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batch/pixetl.dockerfile b/batch/pixetl.dockerfile index fdd77939f..6c7f44fc3 100644 --- a/batch/pixetl.dockerfile +++ b/batch/pixetl.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/pixetl:v1.7.7c +FROM globalforestwatch/pixetl:v1.7.7 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ From 1231de930c659ab7bf450f59de29172f394f8d0e Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Fri, 21 Jun 2024 19:42:19 -0400 Subject: [PATCH 07/14] Update geostore IDs for new PostGIS --- tests/routes/test_geostore.py | 2 +- tests/tasks/test_vector_source_assets.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/routes/test_geostore.py b/tests/routes/test_geostore.py index 2d8375265..da57a14fb 100644 --- a/tests/routes/test_geostore.py +++ b/tests/routes/test_geostore.py @@ -96,7 +96,7 @@ async def test_dataset_version_geostore(async_client: AsyncClient, batch_client) ############################ # This is the hash obtained by POSTing the sample GeoJSON with Postman - sample_geojson_hash = "41b67a74-4ea2-df3f-c3f3-d7131a645f9a" + sample_geojson_hash = "b9faa657-34c9-96d4-fce4-8bb8a1507cb3" # The geometry should be accessible via the geostore table async with ContextEngine("READ"): diff --git a/tests/tasks/test_vector_source_assets.py b/tests/tasks/test_vector_source_assets.py index a5e88c3be..0549bb6ea 100644 --- a/tests/tasks/test_vector_source_assets.py +++ b/tests/tasks/test_vector_source_assets.py @@ -88,7 +88,7 @@ async def test_vector_source_asset(batch_client, async_client: AsyncClient): rows: List[Geostore] = await Geostore.query.gino.all() assert len(rows) == 1 + i - assert rows[0].gfw_geostore_id == UUID("1b368160-caf8-2bd7-819a-ad4949361f02") + assert rows[0].gfw_geostore_id == UUID("23866dd0-9b1a-d742-a7e3-21dd255481dd") await check_dynamic_vector_tile_cache_status(dataset, version) From 54d3e9fd5ef10e7d10e89954ff0cea88f45b21fc Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Mon, 24 Jun 2024 14:22:34 -0400 Subject: [PATCH 08/14] Allow installing GEE package into system packages, for the moment --- batch/gdal-python.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batch/gdal-python.dockerfile b/batch/gdal-python.dockerfile index 4744cc6bb..2c544768b 100644 --- a/batch/gdal-python.dockerfile +++ b/batch/gdal-python.dockerfile @@ -11,7 +11,7 @@ RUN chmod +x -R /opt/python/ ENV PATH="/opt/scripts:${PATH}" ENV PATH="/opt/python:${PATH}" -RUN pip install earthengine-api +RUN pip install --break-system-packages earthengine-api ENV WORKDIR="/tmp" From 6f01178e73c4d6072b50ba2bf49aa19c46ccf875 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Thu, 27 Jun 2024 01:06:25 -0400 Subject: [PATCH 09/14] Fix GEE export script/calling --- batch/python/export_to_gee.py | 2 ++ batch/scripts/cogify.sh | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/batch/python/export_to_gee.py b/batch/python/export_to_gee.py index f2e016014..45524db1e 100644 --- a/batch/python/export_to_gee.py +++ b/batch/python/export_to_gee.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import json import os diff --git a/batch/scripts/cogify.sh b/batch/scripts/cogify.sh index 605776d80..d85344e6c 100755 --- a/batch/scripts/cogify.sh +++ b/batch/scripts/cogify.sh @@ -42,8 +42,7 @@ fi aws s3 cp cog.tif "${TARGET}" if [ -n "$EXPORT_TO_GEE" ]; then - python export_to_gee.py --dataset "${DATASET}" --implementation "${IMPLEMENTATION}" + export_to_gee.py --dataset "${DATASET}" --implementation "${IMPLEMENTATION}" fi -set +x - +set +x \ No newline at end of file From 5f4a2774eda399bfb7210587c02bae2f77df02ab Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Thu, 27 Jun 2024 01:14:42 -0400 Subject: [PATCH 10/14] Source the venv in report_status.sh instead of indiv. Batch scripts --- batch/gdal-python.dockerfile | 4 +--- batch/pixetl.dockerfile | 2 +- batch/postgresql-client.dockerfile | 4 ++-- batch/python/raster_tile_cache.py | 5 ++++- batch/scripts/apply_colormap.sh | 3 +-- batch/scripts/report_status.sh | 3 +++ batch/scripts/resample.sh | 2 +- batch/scripts/run_pixetl.sh | 2 +- batch/scripts/run_pixetl_prep.sh | 2 +- batch/tile_cache.dockerfile | 2 +- 10 files changed, 16 insertions(+), 13 deletions(-) diff --git a/batch/gdal-python.dockerfile b/batch/gdal-python.dockerfile index 2c544768b..bae765ffc 100644 --- a/batch/gdal-python.dockerfile +++ b/batch/gdal-python.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-gdal:v1.2.0 +FROM globalforestwatch/data-api-gdal:v1.2.0b # Copy scripts COPY ./batch/scripts/ /opt/scripts/ @@ -11,8 +11,6 @@ RUN chmod +x -R /opt/python/ ENV PATH="/opt/scripts:${PATH}" ENV PATH="/opt/python:${PATH}" -RUN pip install --break-system-packages earthengine-api - ENV WORKDIR="/tmp" ENTRYPOINT ["/opt/scripts/report_status.sh"] \ No newline at end of file diff --git a/batch/pixetl.dockerfile b/batch/pixetl.dockerfile index 6c7f44fc3..a774b7a18 100644 --- a/batch/pixetl.dockerfile +++ b/batch/pixetl.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/pixetl:v1.7.7 +FROM globalforestwatch/pixetl:v1.7.7b # Copy scripts COPY ./batch/scripts/ /opt/scripts/ diff --git a/batch/postgresql-client.dockerfile b/batch/postgresql-client.dockerfile index afc642f21..7ab81f563 100644 --- a/batch/postgresql-client.dockerfile +++ b/batch/postgresql-client.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-postgresql:1.0.2 +FROM globalforestwatch/data-api-postgresql:v1.1.0b # Copy scripts COPY ./batch/scripts/ /opt/scripts/ @@ -13,4 +13,4 @@ ENV PATH="/opt/python:${PATH}" WORKDIR /tmp -ENTRYPOINT ["/opt/scripts/report_status.sh"] +ENTRYPOINT ["/opt/scripts/report_status.sh"] \ No newline at end of file diff --git a/batch/python/raster_tile_cache.py b/batch/python/raster_tile_cache.py index cecfdd7b0..930d5c86d 100755 --- a/batch/python/raster_tile_cache.py +++ b/batch/python/raster_tile_cache.py @@ -22,6 +22,8 @@ "NUM_PROCESSES", os.environ.get("CORES", multiprocessing.cpu_count()) ) ) +VENV_DIR = os.environ.get("VENV_DIR", "/.venv") + LOGGER = get_logger(__name__) @@ -75,7 +77,8 @@ def create_tiles(args: Tuple[Tuple[str, str], str, str, str, str, int, bool, int gdal2tiles = "16bpp_gdal2tiles.py" cmd: List[str] = [ - gdal2tiles, + f"{VENV_DIR}/bin/python", + os.path.join("/opt/python", gdal2tiles), f"--zoom={zoom_level}", "--s_srs", "EPSG:3857", diff --git a/batch/scripts/apply_colormap.sh b/batch/scripts/apply_colormap.sh index 52ebead94..87220abe5 100644 --- a/batch/scripts/apply_colormap.sh +++ b/batch/scripts/apply_colormap.sh @@ -26,5 +26,4 @@ ARG_ARRAY+=("--source-uri" "${SRC}") ARG_ARRAY+=("--target-prefix" "${TARGET}") -# Run apply_symbology.py with the array of arguments -. /usr/local/app/.venv/bin/activate && pipenv run apply_colormap.py "${ARG_ARRAY[@]}" \ No newline at end of file +apply_colormap.py "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/report_status.sh b/batch/scripts/report_status.sh index b8b779ccb..a964af790 100755 --- a/batch/scripts/report_status.sh +++ b/batch/scripts/report_status.sh @@ -12,6 +12,9 @@ URL=${STATUS_URL}/${AWS_BATCH_JOB_ID} OUTPUT_FILE="/tmp/${AWS_BATCH_JOB_ID}_output.txt" +# Source the virtualenv with all our Python packages +. "${VENV_DIR}"/bin/activate + # If this is not the first attempt, and previous attempts failed due to OOM, # reduce the NUM_PROCESSES value (thus increasing memory per process) if [[ -n $AWS_BATCH_JOB_ATTEMPT ]] && [[ $AWS_BATCH_JOB_ATTEMPT -gt 1 ]]; then diff --git a/batch/scripts/resample.sh b/batch/scripts/resample.sh index 6e9e3ee17..7ecdc0557 100644 --- a/batch/scripts/resample.sh +++ b/batch/scripts/resample.sh @@ -27,4 +27,4 @@ ARG_ARRAY+=("--target-zoom" "${ZOOM_LEVEL}") ARG_ARRAY+=("--target-prefix" "${TARGET}") # Run resample.py with the array of arguments -. /usr/local/app/.venv/bin/activate && pipenv run resample.py "${ARG_ARRAY[@]}" \ No newline at end of file +resample.py "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/run_pixetl.sh b/batch/scripts/run_pixetl.sh index 2fb286688..6fbb6ab7a 100644 --- a/batch/scripts/run_pixetl.sh +++ b/batch/scripts/run_pixetl.sh @@ -35,4 +35,4 @@ fi ARG_ARRAY+=("${JSON}") # Run pixetl with the array of arguments -. /usr/local/app/.venv/bin/activate && pipenv run pixetl "${ARG_ARRAY[@]}" \ No newline at end of file +pixetl "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/run_pixetl_prep.sh b/batch/scripts/run_pixetl_prep.sh index daeca0e14..7dbd5167c 100644 --- a/batch/scripts/run_pixetl_prep.sh +++ b/batch/scripts/run_pixetl_prep.sh @@ -30,4 +30,4 @@ if [ -z "${OVERWRITE}" ]; then fi # Run pixetl_prep with the array of arguments -. /usr/local/app/.venv/bin/activate && pipenv run pixetl_prep "${ARG_ARRAY[@]}" \ No newline at end of file +pixetl_prep "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/tile_cache.dockerfile b/batch/tile_cache.dockerfile index ec564ae37..e96dd5dd3 100644 --- a/batch/tile_cache.dockerfile +++ b/batch/tile_cache.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-tippecanoe:v1.3.0 +FROM globalforestwatch/data-api-tippecanoe:v1.3.1a # Copy scripts COPY ./batch/scripts/ /opt/scripts/ From 477c15931e7eb0a8345ab8d7f81a4f5e08392145 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Thu, 27 Jun 2024 01:15:06 -0400 Subject: [PATCH 11/14] Revert "Source the venv in report_status.sh instead of indiv. Batch scripts" This reverts commit 5f4a2774eda399bfb7210587c02bae2f77df02ab. --- batch/gdal-python.dockerfile | 4 +++- batch/pixetl.dockerfile | 2 +- batch/postgresql-client.dockerfile | 4 ++-- batch/python/raster_tile_cache.py | 5 +---- batch/scripts/apply_colormap.sh | 3 ++- batch/scripts/report_status.sh | 3 --- batch/scripts/resample.sh | 2 +- batch/scripts/run_pixetl.sh | 2 +- batch/scripts/run_pixetl_prep.sh | 2 +- batch/tile_cache.dockerfile | 2 +- 10 files changed, 13 insertions(+), 16 deletions(-) diff --git a/batch/gdal-python.dockerfile b/batch/gdal-python.dockerfile index bae765ffc..2c544768b 100644 --- a/batch/gdal-python.dockerfile +++ b/batch/gdal-python.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-gdal:v1.2.0b +FROM globalforestwatch/data-api-gdal:v1.2.0 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ @@ -11,6 +11,8 @@ RUN chmod +x -R /opt/python/ ENV PATH="/opt/scripts:${PATH}" ENV PATH="/opt/python:${PATH}" +RUN pip install --break-system-packages earthengine-api + ENV WORKDIR="/tmp" ENTRYPOINT ["/opt/scripts/report_status.sh"] \ No newline at end of file diff --git a/batch/pixetl.dockerfile b/batch/pixetl.dockerfile index a774b7a18..6c7f44fc3 100644 --- a/batch/pixetl.dockerfile +++ b/batch/pixetl.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/pixetl:v1.7.7b +FROM globalforestwatch/pixetl:v1.7.7 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ diff --git a/batch/postgresql-client.dockerfile b/batch/postgresql-client.dockerfile index 7ab81f563..afc642f21 100644 --- a/batch/postgresql-client.dockerfile +++ b/batch/postgresql-client.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-postgresql:v1.1.0b +FROM globalforestwatch/data-api-postgresql:1.0.2 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ @@ -13,4 +13,4 @@ ENV PATH="/opt/python:${PATH}" WORKDIR /tmp -ENTRYPOINT ["/opt/scripts/report_status.sh"] \ No newline at end of file +ENTRYPOINT ["/opt/scripts/report_status.sh"] diff --git a/batch/python/raster_tile_cache.py b/batch/python/raster_tile_cache.py index 930d5c86d..cecfdd7b0 100755 --- a/batch/python/raster_tile_cache.py +++ b/batch/python/raster_tile_cache.py @@ -22,8 +22,6 @@ "NUM_PROCESSES", os.environ.get("CORES", multiprocessing.cpu_count()) ) ) -VENV_DIR = os.environ.get("VENV_DIR", "/.venv") - LOGGER = get_logger(__name__) @@ -77,8 +75,7 @@ def create_tiles(args: Tuple[Tuple[str, str], str, str, str, str, int, bool, int gdal2tiles = "16bpp_gdal2tiles.py" cmd: List[str] = [ - f"{VENV_DIR}/bin/python", - os.path.join("/opt/python", gdal2tiles), + gdal2tiles, f"--zoom={zoom_level}", "--s_srs", "EPSG:3857", diff --git a/batch/scripts/apply_colormap.sh b/batch/scripts/apply_colormap.sh index 87220abe5..52ebead94 100644 --- a/batch/scripts/apply_colormap.sh +++ b/batch/scripts/apply_colormap.sh @@ -26,4 +26,5 @@ ARG_ARRAY+=("--source-uri" "${SRC}") ARG_ARRAY+=("--target-prefix" "${TARGET}") -apply_colormap.py "${ARG_ARRAY[@]}" \ No newline at end of file +# Run apply_symbology.py with the array of arguments +. /usr/local/app/.venv/bin/activate && pipenv run apply_colormap.py "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/report_status.sh b/batch/scripts/report_status.sh index a964af790..b8b779ccb 100755 --- a/batch/scripts/report_status.sh +++ b/batch/scripts/report_status.sh @@ -12,9 +12,6 @@ URL=${STATUS_URL}/${AWS_BATCH_JOB_ID} OUTPUT_FILE="/tmp/${AWS_BATCH_JOB_ID}_output.txt" -# Source the virtualenv with all our Python packages -. "${VENV_DIR}"/bin/activate - # If this is not the first attempt, and previous attempts failed due to OOM, # reduce the NUM_PROCESSES value (thus increasing memory per process) if [[ -n $AWS_BATCH_JOB_ATTEMPT ]] && [[ $AWS_BATCH_JOB_ATTEMPT -gt 1 ]]; then diff --git a/batch/scripts/resample.sh b/batch/scripts/resample.sh index 7ecdc0557..6e9e3ee17 100644 --- a/batch/scripts/resample.sh +++ b/batch/scripts/resample.sh @@ -27,4 +27,4 @@ ARG_ARRAY+=("--target-zoom" "${ZOOM_LEVEL}") ARG_ARRAY+=("--target-prefix" "${TARGET}") # Run resample.py with the array of arguments -resample.py "${ARG_ARRAY[@]}" \ No newline at end of file +. /usr/local/app/.venv/bin/activate && pipenv run resample.py "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/run_pixetl.sh b/batch/scripts/run_pixetl.sh index 6fbb6ab7a..2fb286688 100644 --- a/batch/scripts/run_pixetl.sh +++ b/batch/scripts/run_pixetl.sh @@ -35,4 +35,4 @@ fi ARG_ARRAY+=("${JSON}") # Run pixetl with the array of arguments -pixetl "${ARG_ARRAY[@]}" \ No newline at end of file +. /usr/local/app/.venv/bin/activate && pipenv run pixetl "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/run_pixetl_prep.sh b/batch/scripts/run_pixetl_prep.sh index 7dbd5167c..daeca0e14 100644 --- a/batch/scripts/run_pixetl_prep.sh +++ b/batch/scripts/run_pixetl_prep.sh @@ -30,4 +30,4 @@ if [ -z "${OVERWRITE}" ]; then fi # Run pixetl_prep with the array of arguments -pixetl_prep "${ARG_ARRAY[@]}" \ No newline at end of file +. /usr/local/app/.venv/bin/activate && pipenv run pixetl_prep "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/tile_cache.dockerfile b/batch/tile_cache.dockerfile index e96dd5dd3..ec564ae37 100644 --- a/batch/tile_cache.dockerfile +++ b/batch/tile_cache.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-tippecanoe:v1.3.1a +FROM globalforestwatch/data-api-tippecanoe:v1.3.0 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ From 590e075c30489f0c737e7d60146eeb11608076f6 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Thu, 27 Jun 2024 01:14:42 -0400 Subject: [PATCH 12/14] Source the venv in report_status.sh instead of indiv. Batch scripts --- batch/gdal-python.dockerfile | 4 +--- batch/pixetl.dockerfile | 2 +- batch/postgresql-client.dockerfile | 4 ++-- batch/python/raster_tile_cache.py | 5 ++++- batch/scripts/apply_colormap.sh | 3 +-- batch/scripts/report_status.sh | 3 +++ batch/scripts/resample.sh | 2 +- batch/scripts/run_pixetl.sh | 2 +- batch/scripts/run_pixetl_prep.sh | 2 +- batch/tile_cache.dockerfile | 2 +- 10 files changed, 16 insertions(+), 13 deletions(-) diff --git a/batch/gdal-python.dockerfile b/batch/gdal-python.dockerfile index 2c544768b..bae765ffc 100644 --- a/batch/gdal-python.dockerfile +++ b/batch/gdal-python.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-gdal:v1.2.0 +FROM globalforestwatch/data-api-gdal:v1.2.0b # Copy scripts COPY ./batch/scripts/ /opt/scripts/ @@ -11,8 +11,6 @@ RUN chmod +x -R /opt/python/ ENV PATH="/opt/scripts:${PATH}" ENV PATH="/opt/python:${PATH}" -RUN pip install --break-system-packages earthengine-api - ENV WORKDIR="/tmp" ENTRYPOINT ["/opt/scripts/report_status.sh"] \ No newline at end of file diff --git a/batch/pixetl.dockerfile b/batch/pixetl.dockerfile index 6c7f44fc3..a774b7a18 100644 --- a/batch/pixetl.dockerfile +++ b/batch/pixetl.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/pixetl:v1.7.7 +FROM globalforestwatch/pixetl:v1.7.7b # Copy scripts COPY ./batch/scripts/ /opt/scripts/ diff --git a/batch/postgresql-client.dockerfile b/batch/postgresql-client.dockerfile index afc642f21..7ab81f563 100644 --- a/batch/postgresql-client.dockerfile +++ b/batch/postgresql-client.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-postgresql:1.0.2 +FROM globalforestwatch/data-api-postgresql:v1.1.0b # Copy scripts COPY ./batch/scripts/ /opt/scripts/ @@ -13,4 +13,4 @@ ENV PATH="/opt/python:${PATH}" WORKDIR /tmp -ENTRYPOINT ["/opt/scripts/report_status.sh"] +ENTRYPOINT ["/opt/scripts/report_status.sh"] \ No newline at end of file diff --git a/batch/python/raster_tile_cache.py b/batch/python/raster_tile_cache.py index cecfdd7b0..930d5c86d 100755 --- a/batch/python/raster_tile_cache.py +++ b/batch/python/raster_tile_cache.py @@ -22,6 +22,8 @@ "NUM_PROCESSES", os.environ.get("CORES", multiprocessing.cpu_count()) ) ) +VENV_DIR = os.environ.get("VENV_DIR", "/.venv") + LOGGER = get_logger(__name__) @@ -75,7 +77,8 @@ def create_tiles(args: Tuple[Tuple[str, str], str, str, str, str, int, bool, int gdal2tiles = "16bpp_gdal2tiles.py" cmd: List[str] = [ - gdal2tiles, + f"{VENV_DIR}/bin/python", + os.path.join("/opt/python", gdal2tiles), f"--zoom={zoom_level}", "--s_srs", "EPSG:3857", diff --git a/batch/scripts/apply_colormap.sh b/batch/scripts/apply_colormap.sh index 52ebead94..87220abe5 100644 --- a/batch/scripts/apply_colormap.sh +++ b/batch/scripts/apply_colormap.sh @@ -26,5 +26,4 @@ ARG_ARRAY+=("--source-uri" "${SRC}") ARG_ARRAY+=("--target-prefix" "${TARGET}") -# Run apply_symbology.py with the array of arguments -. /usr/local/app/.venv/bin/activate && pipenv run apply_colormap.py "${ARG_ARRAY[@]}" \ No newline at end of file +apply_colormap.py "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/report_status.sh b/batch/scripts/report_status.sh index b8b779ccb..a964af790 100755 --- a/batch/scripts/report_status.sh +++ b/batch/scripts/report_status.sh @@ -12,6 +12,9 @@ URL=${STATUS_URL}/${AWS_BATCH_JOB_ID} OUTPUT_FILE="/tmp/${AWS_BATCH_JOB_ID}_output.txt" +# Source the virtualenv with all our Python packages +. "${VENV_DIR}"/bin/activate + # If this is not the first attempt, and previous attempts failed due to OOM, # reduce the NUM_PROCESSES value (thus increasing memory per process) if [[ -n $AWS_BATCH_JOB_ATTEMPT ]] && [[ $AWS_BATCH_JOB_ATTEMPT -gt 1 ]]; then diff --git a/batch/scripts/resample.sh b/batch/scripts/resample.sh index 6e9e3ee17..7ecdc0557 100644 --- a/batch/scripts/resample.sh +++ b/batch/scripts/resample.sh @@ -27,4 +27,4 @@ ARG_ARRAY+=("--target-zoom" "${ZOOM_LEVEL}") ARG_ARRAY+=("--target-prefix" "${TARGET}") # Run resample.py with the array of arguments -. /usr/local/app/.venv/bin/activate && pipenv run resample.py "${ARG_ARRAY[@]}" \ No newline at end of file +resample.py "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/run_pixetl.sh b/batch/scripts/run_pixetl.sh index 2fb286688..6fbb6ab7a 100644 --- a/batch/scripts/run_pixetl.sh +++ b/batch/scripts/run_pixetl.sh @@ -35,4 +35,4 @@ fi ARG_ARRAY+=("${JSON}") # Run pixetl with the array of arguments -. /usr/local/app/.venv/bin/activate && pipenv run pixetl "${ARG_ARRAY[@]}" \ No newline at end of file +pixetl "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/scripts/run_pixetl_prep.sh b/batch/scripts/run_pixetl_prep.sh index daeca0e14..7dbd5167c 100644 --- a/batch/scripts/run_pixetl_prep.sh +++ b/batch/scripts/run_pixetl_prep.sh @@ -30,4 +30,4 @@ if [ -z "${OVERWRITE}" ]; then fi # Run pixetl_prep with the array of arguments -. /usr/local/app/.venv/bin/activate && pipenv run pixetl_prep "${ARG_ARRAY[@]}" \ No newline at end of file +pixetl_prep "${ARG_ARRAY[@]}" \ No newline at end of file diff --git a/batch/tile_cache.dockerfile b/batch/tile_cache.dockerfile index ec564ae37..e96dd5dd3 100644 --- a/batch/tile_cache.dockerfile +++ b/batch/tile_cache.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-tippecanoe:v1.3.0 +FROM globalforestwatch/data-api-tippecanoe:v1.3.1a # Copy scripts COPY ./batch/scripts/ /opt/scripts/ From 8cb1036a46233fb43c4ce72e42d65a9da73a4c41 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Thu, 27 Jun 2024 10:46:24 -0400 Subject: [PATCH 13/14] Update build/packages, esp. to support testing on ARM Macs; remove unnecessary musl dep --- Dockerfile | 6 +- Pipfile | 5 +- Pipfile.lock | 947 ++++++++++++++++++++++++++------------------------- 3 files changed, 483 insertions(+), 475 deletions(-) diff --git a/Dockerfile b/Dockerfile index 766fb23c3..ed1e26bd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,12 @@ FROM tiangolo/uvicorn-gunicorn-fastapi:python3.10-slim ARG ENV RUN apt-get update -y \ - && apt-get install --no-install-recommends -y gcc libc-dev musl-dev \ - postgresql-client libpq-dev make git jq \ + && apt-get install --no-install-recommends -y gcc g++ libc-dev \ + postgresql-client libpq-dev make git jq libgdal-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN pip install --upgrade pip && pip install pipenv==v2022.11.30 +RUN pip install --upgrade pip && pip install pipenv==2024.0.1 #TODO move to pipfile when operational RUN pip install newrelic diff --git a/Pipfile b/Pipfile index c18681840..e9c68fd00 100644 --- a/Pipfile +++ b/Pipfile @@ -14,13 +14,14 @@ geopandas = "*" # Needed by pixetl in batch script test gfw_pixetl = {git = "https://github.com/wri/gfw_pixetl.git", ref = "develop"} moto = {version = "<5", extras = ["awslambda", "batch", "ec2", "s3", "secretsmanager"]} openapi_spec_validator = "*" +pandas = "<2.2" # Needed by pixetl in batch script test pre-commit = "*" pytest = "*" pytest-asyncio = "<0.19" pytest-cov = "*" pytest-timeout = "*" rasterio = "*" -responses = "<0.16" +responses = "*" retrying = "*" # Needed by pixetl in batch script test [packages] @@ -43,7 +44,7 @@ google-cloud-storage = "*" httpcore = "*" httpx = "*" httpx-auth = "*" -numpy = "*" +numpy = "<2.0" orjson = "*" packaging = "*" pendulum = "<3" diff --git a/Pipfile.lock b/Pipfile.lock index d27a78d4d..da760fee6 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "31799ee534b534382f9aadf0c78558a7a989cc3f09f0e2ebb5464bd1c28b9633" + "sha256": "2d4dabcfb91b87b2e7bf776eaa3eb28353a7a5ffe5c2ee8257342d81037096bc" }, "pipfile-spec": 6, "requires": { @@ -27,12 +27,12 @@ }, "aiofiles": { "hashes": [ - "sha256:19297512c647d4b27a2cf7c34caa7e405c0d60b5560618a29a9fe027b18b0107", - "sha256:84ec2218d8419404abcb9f0c02df3f34c6e0a68ed41072acfb1cef5cbc29051a" + "sha256:22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c", + "sha256:b4ec55f4195e3eb5d7abd1bf7e061763e864dd4954231fb8539a0ef8bb8260e5" ], "index": "pypi", - "markers": "python_version >= '3.7'", - "version": "==23.2.1" + "markers": "python_version >= '3.8'", + "version": "==24.1.0" }, "aiohttp": { "hashes": [ @@ -127,20 +127,20 @@ }, "alembic": { "hashes": [ - "sha256:2edcc97bed0bd3272611ce3a98d98279e9c209e7186e43e75bbb1b2bdfdbcc43", - "sha256:4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595" + "sha256:1ff0ae32975f4fd96028c39ed9bb3c867fe3af956bd7bb37343b54c9fe7445ef", + "sha256:6b8733129a6224a9a711e17c99b08462dbf7cc9670ba8f2e2ae9af860ceb1953" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==1.13.1" + "version": "==1.13.2" }, "anyio": { "hashes": [ - "sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8", - "sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6" + "sha256:5aadc6a1bbb7cdb0bede386cac5e2940f5e2ff3aa20277e991cf028e0585ce94", + "sha256:c1b2d8f46a8a812513012e1107cb0e68c17159a7a594208005a57dc776e1bdc7" ], "markers": "python_version >= '3.8'", - "version": "==4.3.0" + "version": "==4.4.0" }, "arq": { "hashes": [ @@ -226,21 +226,21 @@ }, "boto3": { "hashes": [ - "sha256:58d097241f3895c4a4c80c9e606689c6e06d77f55f9f53a4cc02dee7e03938b9", - "sha256:59b6499f1bb423dd99de6566a20d0a7cf1a5476824be3a792290fd86600e8365" + "sha256:342782c02ff077aae118c9c61179eed95c585831fba666baacc5588ff04aa6e1", + "sha256:f6d6e5b0c9ab022a75373fa16c01f0cd54bc1bb64ef3b6ac64ac7cedd56cbe9c" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==1.34.103" + "version": "==1.34.134" }, "botocore": { "hashes": [ - "sha256:0330d139f18f78d38127e65361859e24ebd6a8bcba184f903c01bb999a3fa431", - "sha256:5f07e2c7302c0a9f469dcd08b4ddac152e9f5888b12220242c20056255010939" + "sha256:45219e00639755f92569b29f8f279d5dde721494791412c1f7026a3779e8d9f4", + "sha256:e29c299599426ed16dd2d4c1e20eef784f96b15e1850ebbc59a3250959285b95" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==1.34.103" + "version": "==1.34.134" }, "cachetools": { "hashes": [ @@ -252,11 +252,11 @@ }, "certifi": { "hashes": [ - "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f", - "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1" + "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516", + "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56" ], "markers": "python_version >= '3.6'", - "version": "==2024.2.2" + "version": "==2024.6.2" }, "charset-normalizer": { "hashes": [ @@ -372,12 +372,12 @@ }, "email-validator": { "hashes": [ - "sha256:200a70680ba08904be6d1eef729205cc0d687634399a5924d842533efb824b84", - "sha256:97d882d174e2a65732fb43bfce81a3a834cbc1bde8bf419e30ef5ea976370a05" + "sha256:561977c2d73ce3611850a06fa56b414621e0c8faa9d66f2611407d87465da631", + "sha256:cb690f344c617a714f22e66ae771445a1ceb46821152df8e165c5f9a364582b7" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==2.1.1" + "version": "==2.2.0" }, "exceptiongroup": { "hashes": [ @@ -517,19 +517,19 @@ }, "google-api-core": { "hashes": [ - "sha256:8661eec4078c35428fd3f69a2c7ee29e342896b70f01d1a1cbcb334372dd6251", - "sha256:cf1b7c2694047886d2af1128a03ae99e391108a08804f87cfd35970e49c9cd10" + "sha256:f12a9b8309b5e21d92483bbd47ce2c445861ec7d269ef6784ecc0ea8c1fa6125", + "sha256:f4695f1e3650b316a795108a76a1c416e6afb036199d1c1f1f110916df479ffd" ], "markers": "python_version >= '3.7'", - "version": "==2.19.0" + "version": "==2.19.1" }, "google-auth": { "hashes": [ - "sha256:672dff332d073227550ffc7457868ac4218d6c500b155fe6cc17d2b13602c360", - "sha256:d452ad095688cd52bae0ad6fafe027f6a6d6f560e810fec20914e17a09526415" + "sha256:8df7da660f62757388b8a7f249df13549b3373f24388cb5d2f1dd91cc18180b5", + "sha256:ab630a1320f6720909ad76a7dbdb6841cdf5c66b328d690027e4867bdfb16688" ], "markers": "python_version >= '3.7'", - "version": "==2.29.0" + "version": "==2.30.0" }, "google-cloud-core": { "hashes": [ @@ -541,12 +541,12 @@ }, "google-cloud-storage": { "hashes": [ - "sha256:91a06b96fb79cf9cdfb4e759f178ce11ea885c79938f89590344d079305f5852", - "sha256:dda485fa503710a828d01246bd16ce9db0823dc51bbca742ce96a6817d58669f" + "sha256:49378abff54ef656b52dca5ef0f2eba9aa83dc2b2c72c78714b03a1a95fe9388", + "sha256:5b393bc766b7a3bc6f5407b9e665b2450d36282614b7945e570b3480a456d1e1" ], "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==2.16.0" + "version": "==2.17.0" }, "google-crc32c": { "hashes": [ @@ -624,19 +624,19 @@ }, "google-resumable-media": { "hashes": [ - "sha256:5f18f5fa9836f4b083162064a1c2c98c17239bfda9ca50ad970ccf905f3e625b", - "sha256:79543cfe433b63fd81c0844b7803aba1bb8950b47bedf7d980c38fa123937e08" + "sha256:103ebc4ba331ab1bfdac0250f8033627a2cd7cde09e7ccff9181e31ba4315b2c", + "sha256:eae451a7b2e2cdbaaa0fd2eb00cc8a1ee5e95e16b55597359cbc3d27d7d90e33" ], "markers": "python_version >= '3.7'", - "version": "==2.7.0" + "version": "==2.7.1" }, "googleapis-common-protos": { "hashes": [ - "sha256:17ad01b11d5f1d0171c06d3ba5c04c54474e883b66b949722b4938ee2694ef4e", - "sha256:ae45f75702f7c08b541f750854a678bd8f534a1a6bace6afe975f1d0a82d6632" + "sha256:27a2499c7e8aff199665b22741997e485eccc8645aa9176c7c988e6fae507945", + "sha256:27c5abdffc4911f28101e635de1533fb4cfd2c37fbaa9174587c799fac90aa87" ], "markers": "python_version >= '3.7'", - "version": "==1.63.0" + "version": "==1.63.2" }, "h11": { "hashes": [ @@ -846,11 +846,11 @@ }, "mako": { "hashes": [ - "sha256:5324b88089a8978bf76d1629774fcc2f1c07b82acdf00f4c5dd8ceadfffc4b40", - "sha256:e16c01d9ab9c11f7290eef1cfefc093fb5a45ee4a3da09e2fec2e4d1bae54e73" + "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a", + "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" ], "markers": "python_version >= '3.8'", - "version": "==1.3.3" + "version": "==1.3.5" }, "markdown-it-py": { "hashes": [ @@ -1075,65 +1075,65 @@ }, "orjson": { "hashes": [ - "sha256:0943a96b3fa09bee1afdfccc2cb236c9c64715afa375b2af296c73d91c23eab2", - "sha256:0a62f9968bab8a676a164263e485f30a0b748255ee2f4ae49a0224be95f4532b", - "sha256:16bda83b5c61586f6f788333d3cf3ed19015e3b9019188c56983b5a299210eb5", - "sha256:1770e2a0eae728b050705206d84eda8b074b65ee835e7f85c919f5705b006c9b", - "sha256:17e0713fc159abc261eea0f4feda611d32eabc35708b74bef6ad44f6c78d5ea0", - "sha256:18566beb5acd76f3769c1d1a7ec06cdb81edc4d55d2765fb677e3eaa10fa99e0", - "sha256:1952c03439e4dce23482ac846e7961f9d4ec62086eb98ae76d97bd41d72644d7", - "sha256:1bd2218d5a3aa43060efe649ec564ebedec8ce6ae0a43654b81376216d5ebd42", - "sha256:1c23dfa91481de880890d17aa7b91d586a4746a4c2aa9a145bebdbaf233768d5", - "sha256:252124b198662eee80428f1af8c63f7ff077c88723fe206a25df8dc57a57b1fa", - "sha256:2b166507acae7ba2f7c315dcf185a9111ad5e992ac81f2d507aac39193c2c818", - "sha256:2e5e176c994ce4bd434d7aafb9ecc893c15f347d3d2bbd8e7ce0b63071c52e25", - "sha256:3582b34b70543a1ed6944aca75e219e1192661a63da4d039d088a09c67543b08", - "sha256:382e52aa4270a037d41f325e7d1dfa395b7de0c367800b6f337d8157367bf3a7", - "sha256:416b195f78ae461601893f482287cee1e3059ec49b4f99479aedf22a20b1098b", - "sha256:4ad1f26bea425041e0a1adad34630c4825a9e3adec49079b1fb6ac8d36f8b754", - "sha256:4c895383b1ec42b017dd2c75ae8a5b862fc489006afde06f14afbdd0309b2af0", - "sha256:5102f50c5fc46d94f2033fe00d392588564378260d64377aec702f21a7a22912", - "sha256:520de5e2ef0b4ae546bea25129d6c7c74edb43fc6cf5213f511a927f2b28148b", - "sha256:544a12eee96e3ab828dbfcb4d5a0023aa971b27143a1d35dc214c176fdfb29b3", - "sha256:73100d9abbbe730331f2242c1fc0bcb46a3ea3b4ae3348847e5a141265479700", - "sha256:831c6ef73f9aa53c5f40ae8f949ff7681b38eaddb6904aab89dca4d85099cb78", - "sha256:8bc7a4df90da5d535e18157220d7915780d07198b54f4de0110eca6b6c11e290", - "sha256:8d0b84403d287d4bfa9bf7d1dc298d5c1c5d9f444f3737929a66f2fe4fb8f134", - "sha256:8d40c7f7938c9c2b934b297412c067936d0b54e4b8ab916fd1a9eb8f54c02294", - "sha256:9059d15c30e675a58fdcd6f95465c1522b8426e092de9fff20edebfdc15e1cb0", - "sha256:93433b3c1f852660eb5abdc1f4dd0ced2be031ba30900433223b28ee0140cde5", - "sha256:978be58a68ade24f1af7758626806e13cff7748a677faf95fbb298359aa1e20d", - "sha256:99b880d7e34542db89f48d14ddecbd26f06838b12427d5a25d71baceb5ba119d", - "sha256:9a7bc9e8bc11bac40f905640acd41cbeaa87209e7e1f57ade386da658092dc16", - "sha256:9e253498bee561fe85d6325ba55ff2ff08fb5e7184cd6a4d7754133bd19c9195", - "sha256:9f3e87733823089a338ef9bbf363ef4de45e5c599a9bf50a7a9b82e86d0228da", - "sha256:9fb6c3f9f5490a3eb4ddd46fc1b6eadb0d6fc16fb3f07320149c3286a1409dd8", - "sha256:a39aa73e53bec8d410875683bfa3a8edf61e5a1c7bb4014f65f81d36467ea098", - "sha256:b69a58a37dab856491bf2d3bbf259775fdce262b727f96aafbda359cb1d114d8", - "sha256:b8d4d1a6868cde356f1402c8faeb50d62cee765a1f7ffcfd6de732ab0581e063", - "sha256:ba7f67aa7f983c4345eeda16054a4677289011a478ca947cd69c0a86ea45e534", - "sha256:be2719e5041e9fb76c8c2c06b9600fe8e8584e6980061ff88dcbc2691a16d20d", - "sha256:be2aab54313752c04f2cbaab4515291ef5af8c2256ce22abc007f89f42f49109", - "sha256:c0403ed9c706dcd2809f1600ed18f4aae50be263bd7112e54b50e2c2bc3ebd6d", - "sha256:c8334c0d87103bb9fbbe59b78129f1f40d1d1e8355bbed2ca71853af15fa4ed3", - "sha256:cb0175a5798bdc878956099f5c54b9837cb62cfbf5d0b86ba6d77e43861bcec2", - "sha256:ccaa0a401fc02e8828a5bedfd80f8cd389d24f65e5ca3954d72c6582495b4bcf", - "sha256:cf20465e74c6e17a104ecf01bf8cd3b7b252565b4ccee4548f18b012ff2f8069", - "sha256:d4a654ec1de8fdaae1d80d55cee65893cb06494e124681ab335218be6a0691e7", - "sha256:e852baafceff8da3c9defae29414cc8513a1586ad93e45f27b89a639c68e8176" + "sha256:03b565c3b93f5d6e001db48b747d31ea3819b89abf041ee10ac6988886d18e01", + "sha256:099e81a5975237fda3100f918839af95f42f981447ba8f47adb7b6a3cdb078fa", + "sha256:10c0eb7e0c75e1e486c7563fe231b40fdd658a035ae125c6ba651ca3b07936f5", + "sha256:1146bf85ea37ac421594107195db8bc77104f74bc83e8ee21a2e58596bfb2f04", + "sha256:1670fe88b116c2745a3a30b0f099b699a02bb3482c2591514baf5433819e4f4d", + "sha256:185c394ef45b18b9a7d8e8f333606e2e8194a50c6e3c664215aae8cf42c5385e", + "sha256:1ad1de7fef79736dde8c3554e75361ec351158a906d747bd901a52a5c9c8d24b", + "sha256:235dadefb793ad12f7fa11e98a480db1f7c6469ff9e3da5e73c7809c700d746b", + "sha256:28afa96f496474ce60d3340fe8d9a263aa93ea01201cd2bad844c45cd21f5268", + "sha256:2d97531cdfe9bdd76d492e69800afd97e5930cb0da6a825646667b2c6c6c0211", + "sha256:338fd4f071b242f26e9ca802f443edc588fa4ab60bfa81f38beaedf42eda226c", + "sha256:36a10f43c5f3a55c2f680efe07aa93ef4a342d2960dd2b1b7ea2dd764fe4a37c", + "sha256:3d21b9983da032505f7050795e98b5d9eee0df903258951566ecc358f6696969", + "sha256:51bbcdea96cdefa4a9b4461e690c75ad4e33796530d182bdd5c38980202c134a", + "sha256:53ed1c879b10de56f35daf06dbc4a0d9a5db98f6ee853c2dbd3ee9d13e6f302f", + "sha256:545d493c1f560d5ccfc134803ceb8955a14c3fcb47bbb4b2fee0232646d0b932", + "sha256:584c902ec19ab7928fd5add1783c909094cc53f31ac7acfada817b0847975f26", + "sha256:5a35455cc0b0b3a1eaf67224035f5388591ec72b9b6136d66b49a553ce9eb1e6", + "sha256:5df58d206e78c40da118a8c14fc189207fffdcb1f21b3b4c9c0c18e839b5a214", + "sha256:64c9cc089f127e5875901ac05e5c25aa13cfa5dbbbd9602bda51e5c611d6e3e2", + "sha256:68f85ecae7af14a585a563ac741b0547a3f291de81cd1e20903e79f25170458f", + "sha256:6970ed7a3126cfed873c5d21ece1cd5d6f83ca6c9afb71bbae21a0b034588d96", + "sha256:6b68742c469745d0e6ca5724506858f75e2f1e5b59a4315861f9e2b1df77775a", + "sha256:7a5baef8a4284405d96c90c7c62b755e9ef1ada84c2406c24a9ebec86b89f46d", + "sha256:7d10cc1b594951522e35a3463da19e899abe6ca95f3c84c69e9e901e0bd93d38", + "sha256:85c89131d7b3218db1b24c4abecea92fd6c7f9fab87441cfc342d3acc725d807", + "sha256:8a11d459338f96a9aa7f232ba95679fc0c7cedbd1b990d736467894210205c09", + "sha256:8c13ca5e2ddded0ce6a927ea5a9f27cae77eee4c75547b4297252cb20c4d30e6", + "sha256:9cd684927af3e11b6e754df80b9ffafd9fb6adcaa9d3e8fdd5891be5a5cad51e", + "sha256:b2efbd67feff8c1f7728937c0d7f6ca8c25ec81373dc8db4ef394c1d93d13dc5", + "sha256:b39e006b00c57125ab974362e740c14a0c6a66ff695bff44615dcf4a70ce2b86", + "sha256:b6c8e30adfa52c025f042a87f450a6b9ea29649d828e0fec4858ed5e6caecf63", + "sha256:be79e2393679eda6a590638abda16d167754393f5d0850dcbca2d0c3735cebe2", + "sha256:c05f16701ab2a4ca146d0bca950af254cb7c02f3c01fca8efbbad82d23b3d9d4", + "sha256:c4057c3b511bb8aef605616bd3f1f002a697c7e4da6adf095ca5b84c0fd43595", + "sha256:c4a65310ccb5c9910c47b078ba78e2787cb3878cdded1702ac3d0da71ddc5228", + "sha256:ca0b3a94ac8d3886c9581b9f9de3ce858263865fdaa383fbc31c310b9eac07c9", + "sha256:cc28e90a7cae7fcba2493953cff61da5a52950e78dc2dacfe931a317ee3d8de7", + "sha256:cdf7365063e80899ae3a697def1277c17a7df7ccfc979990a403dfe77bb54d40", + "sha256:d69858c32f09c3e1ce44b617b3ebba1aba030e777000ebdf72b0d8e365d0b2b3", + "sha256:dbead71dbe65f959b7bd8cf91e0e11d5338033eba34c114f69078d59827ee139", + "sha256:dcbe82b35d1ac43b0d84072408330fd3295c2896973112d495e7234f7e3da2e1", + "sha256:dfc91d4720d48e2a709e9c368d5125b4b5899dced34b5400c3837dadc7d6271b", + "sha256:eded5138cc565a9d618e111c6d5c2547bbdd951114eb822f7f6309e04db0fb47", + "sha256:f4324929c2dd917598212bfd554757feca3e5e0fa60da08be11b4aa8b90013c1", + "sha256:fb66215277a230c456f9038d5e2d84778141643207f85336ef8d2a9da26bd7ca" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==3.10.3" + "version": "==3.10.5" }, "packaging": { "hashes": [ - "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5", - "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9" + "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", + "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" ], "index": "pypi", - "markers": "python_version >= '3.7'", - "version": "==24.0" + "markers": "python_version >= '3.8'", + "version": "==24.1" }, "pendulum": { "hashes": [ @@ -1188,51 +1188,52 @@ }, "proto-plus": { "hashes": [ - "sha256:89075171ef11988b3fa157f5dbd8b9cf09d65fffee97e29ce403cd8defba19d2", - "sha256:a829c79e619e1cf632de091013a4173deed13a55f326ef84f05af6f50ff4c82c" + "sha256:30b72a5ecafe4406b0d339db35b56c4059064e69227b8c3bda7462397f966445", + "sha256:402576830425e5f6ce4c2a6702400ac79897dab0b4343821aa5188b0fab81a12" ], - "markers": "python_version >= '3.6'", - "version": "==1.23.0" + "markers": "python_version >= '3.7'", + "version": "==1.24.0" }, "protobuf": { "hashes": [ - "sha256:19b270aeaa0099f16d3ca02628546b8baefe2955bbe23224aaf856134eccf1e4", - "sha256:209ba4cc916bab46f64e56b85b090607a676f66b473e6b762e6f1d9d591eb2e8", - "sha256:25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c", - "sha256:7c8daa26095f82482307bc717364e7c13f4f1c99659be82890dcfc215194554d", - "sha256:c053062984e61144385022e53678fbded7aea14ebb3e0305ae3592fb219ccfa4", - "sha256:d4198877797a83cbfe9bffa3803602bbe1625dc30d8a097365dbc762e5790faa", - "sha256:e3c97a1555fd6388f857770ff8b9703083de6bf1f9274a002a332d65fbb56c8c", - "sha256:e7cb0ae90dd83727f0c0718634ed56837bfeeee29a5f82a7514c03ee1364c019", - "sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9", - "sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c", - "sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2" + "sha256:0e341109c609749d501986b835f667c6e1e24531096cff9d34ae411595e26505", + "sha256:176c12b1f1c880bf7a76d9f7c75822b6a2bc3db2d28baa4d300e8ce4cde7409b", + "sha256:354d84fac2b0d76062e9b3221f4abbbacdfd2a4d8af36bab0474f3a0bb30ab38", + "sha256:4fadd8d83e1992eed0248bc50a4a6361dc31bcccc84388c54c86e530b7f58863", + "sha256:54330f07e4949d09614707c48b06d1a22f8ffb5763c159efd5c0928326a91470", + "sha256:610e700f02469c4a997e58e328cac6f305f649826853813177e6290416e846c6", + "sha256:7fc3add9e6003e026da5fc9e59b131b8f22b428b991ccd53e2af8071687b4fce", + "sha256:9e8f199bf7f97bd7ecebffcae45ebf9527603549b2b562df0fbc6d4d688f14ca", + "sha256:a109916aaac42bff84702fb5187f3edadbc7c97fc2c99c5ff81dd15dcce0d1e5", + "sha256:b848dbe1d57ed7c191dfc4ea64b8b004a3f9ece4bf4d0d80a367b76df20bf36e", + "sha256:f3ecdef226b9af856075f28227ff2c90ce3a594d092c39bee5513573f25e2714" ], "markers": "python_version >= '3.8'", - "version": "==4.25.3" + "version": "==5.27.2" }, "psutil": { "hashes": [ - "sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d", - "sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73", - "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8", - "sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2", - "sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e", - "sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36", - "sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7", - "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c", - "sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee", - "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421", - "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf", - "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81", - "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0", - "sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631", - "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4", - "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8" + "sha256:02b69001f44cc73c1c5279d02b30a817e339ceb258ad75997325e0e6169d8b35", + "sha256:1287c2b95f1c0a364d23bc6f2ea2365a8d4d9b726a3be7294296ff7ba97c17f0", + "sha256:1e7c870afcb7d91fdea2b37c24aeb08f98b6d67257a5cb0a8bc3ac68d0f1a68c", + "sha256:21f1fb635deccd510f69f485b87433460a603919b45e2a324ad65b0cc74f8fb1", + "sha256:33ea5e1c975250a720b3a6609c490db40dae5d83a4eb315170c4fe0d8b1f34b3", + "sha256:34859b8d8f423b86e4385ff3665d3f4d94be3cdf48221fbe476e883514fdb71c", + "sha256:5fd9a97c8e94059b0ef54a7d4baf13b405011176c3b6ff257c247cae0d560ecd", + "sha256:6ec7588fb3ddaec7344a825afe298db83fe01bfaaab39155fa84cf1c0d6b13c3", + "sha256:6ed2440ada7ef7d0d608f20ad89a04ec47d2d3ab7190896cd62ca5fc4fe08bf0", + "sha256:8faae4f310b6d969fa26ca0545338b21f73c6b15db7c4a8d934a5482faa818f2", + "sha256:a021da3e881cd935e64a3d0a20983bda0bb4cf80e4f74fa9bfcb1bc5785360c6", + "sha256:a495580d6bae27291324fe60cea0b5a7c23fa36a7cd35035a16d93bdcf076b9d", + "sha256:a9a3dbfb4de4f18174528d87cc352d1f788b7496991cca33c6996f40c9e3c92c", + "sha256:c588a7e9b1173b6e866756dde596fd4cad94f9399daf99ad8c3258b3cb2b47a0", + "sha256:e2e8d0054fc88153ca0544f5c4d554d42e33df2e009c4ff42284ac9ebdef4132", + "sha256:fc8c9510cde0146432bbdb433322861ee8c3efbf8589865c8bf8d21cb30c4d14", + "sha256:ffe7fc9b6b36beadc8c322f84e1caff51e8703b88eee1da46d1e3a6ae11b4fd0" ], "index": "pypi", "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==5.9.8" + "version": "==6.0.0" }, "psycopg2": { "hashes": [ @@ -1272,46 +1273,53 @@ }, "pydantic": { "hashes": [ - "sha256:005655cabc29081de8243126e036f2065bd7ea5b9dff95fde6d2c642d39755de", - "sha256:0d142fa1b8f2f0ae11ddd5e3e317dcac060b951d605fda26ca9b234b92214986", - "sha256:22ed12ee588b1df028a2aa5d66f07bf8f8b4c8579c2e96d5a9c1f96b77f3bb55", - "sha256:2746189100c646682eff0bce95efa7d2e203420d8e1c613dc0c6b4c1d9c1fde4", - "sha256:28e552a060ba2740d0d2aabe35162652c1459a0b9069fe0db7f4ee0e18e74d58", - "sha256:3287e1614393119c67bd4404f46e33ae3be3ed4cd10360b48d0a4459f420c6a3", - "sha256:3350f527bb04138f8aff932dc828f154847fbdc7a1a44c240fbfff1b57f49a12", - "sha256:3453685ccd7140715e05f2193d64030101eaad26076fad4e246c1cc97e1bb30d", - "sha256:394f08750bd8eaad714718812e7fab615f873b3cdd0b9d84e76e51ef3b50b6b7", - "sha256:4e316e54b5775d1eb59187f9290aeb38acf620e10f7fd2f776d97bb788199e53", - "sha256:50f1666a9940d3d68683c9d96e39640f709d7a72ff8702987dab1761036206bb", - "sha256:51d405b42f1b86703555797270e4970a9f9bd7953f3990142e69d1037f9d9e51", - "sha256:584f2d4c98ffec420e02305cf675857bae03c9d617fcfdc34946b1160213a948", - "sha256:5e09c19df304b8123938dc3c53d3d3be6ec74b9d7d0d80f4f4b5432ae16c2022", - "sha256:676ed48f2c5bbad835f1a8ed8a6d44c1cd5a21121116d2ac40bd1cd3619746ed", - "sha256:67f1a1fb467d3f49e1708a3f632b11c69fccb4e748a325d5a491ddc7b5d22383", - "sha256:6a51a1dd4aa7b3f1317f65493a182d3cff708385327c1c82c81e4a9d6d65b2e4", - "sha256:6bd7030c9abc80134087d8b6e7aa957e43d35714daa116aced57269a445b8f7b", - "sha256:75279d3cac98186b6ebc2597b06bcbc7244744f6b0b44a23e4ef01e5683cc0d2", - "sha256:7ac9237cd62947db00a0d16acf2f3e00d1ae9d3bd602b9c415f93e7a9fc10528", - "sha256:7ea210336b891f5ea334f8fc9f8f862b87acd5d4a0cbc9e3e208e7aa1775dabf", - "sha256:82790d4753ee5d00739d6cb5cf56bceb186d9d6ce134aca3ba7befb1eedbc2c8", - "sha256:92229f73400b80c13afcd050687f4d7e88de9234d74b27e6728aa689abcf58cc", - "sha256:9bea1f03b8d4e8e86702c918ccfd5d947ac268f0f0cc6ed71782e4b09353b26f", - "sha256:a980a77c52723b0dc56640ced396b73a024d4b74f02bcb2d21dbbac1debbe9d0", - "sha256:af9850d98fc21e5bc24ea9e35dd80a29faf6462c608728a110c0a30b595e58b7", - "sha256:bbc6989fad0c030bd70a0b6f626f98a862224bc2b1e36bfc531ea2facc0a340c", - "sha256:be51dd2c8596b25fe43c0a4a59c2bee4f18d88efb8031188f9e7ddc6b469cf44", - "sha256:c365ad9c394f9eeffcb30a82f4246c0006417f03a7c0f8315d6211f25f7cb654", - "sha256:c3d5731a120752248844676bf92f25a12f6e45425e63ce22e0849297a093b5b0", - "sha256:ca832e124eda231a60a041da4f013e3ff24949d94a01154b137fc2f2a43c3ffb", - "sha256:d207d5b87f6cbefbdb1198154292faee8017d7495a54ae58db06762004500d00", - "sha256:d31ee5b14a82c9afe2bd26aaa405293d4237d0591527d9129ce36e58f19f95c1", - "sha256:d3b5c4cbd0c9cb61bbbb19ce335e1f8ab87a811f6d589ed52b0254cf585d709c", - "sha256:d573082c6ef99336f2cb5b667b781d2f776d4af311574fb53d908517ba523c22", - "sha256:e49db944fad339b2ccb80128ffd3f8af076f9f287197a480bf1e4ca053a866f0" + "sha256:098ad8de840c92ea586bf8efd9e2e90c6339d33ab5c1cfbb85be66e4ecf8213f", + "sha256:0e2495309b1266e81d259a570dd199916ff34f7f51f1b549a0d37a6d9b17b4dc", + "sha256:0fa51175313cc30097660b10eec8ca55ed08bfa07acbfe02f7a42f6c242e9a4b", + "sha256:11289fa895bcbc8f18704efa1d8020bb9a86314da435348f59745473eb042e6b", + "sha256:2a72d2a5ff86a3075ed81ca031eac86923d44bc5d42e719d585a8eb547bf0c9b", + "sha256:371dcf1831f87c9e217e2b6a0c66842879a14873114ebb9d0861ab22e3b5bb1e", + "sha256:409b2b36d7d7d19cd8310b97a4ce6b1755ef8bd45b9a2ec5ec2b124db0a0d8f3", + "sha256:4866a1579c0c3ca2c40575398a24d805d4db6cb353ee74df75ddeee3c657f9a7", + "sha256:48db882e48575ce4b39659558b2f9f37c25b8d348e37a2b4e32971dd5a7d6227", + "sha256:525bbef620dac93c430d5d6bdbc91bdb5521698d434adf4434a7ef6ffd5c4b7f", + "sha256:543da3c6914795b37785703ffc74ba4d660418620cc273490d42c53949eeeca6", + "sha256:62d96b8799ae3d782df7ec9615cb59fc32c32e1ed6afa1b231b0595f6516e8ab", + "sha256:6654028d1144df451e1da69a670083c27117d493f16cf83da81e1e50edce72ad", + "sha256:7017971ffa7fd7808146880aa41b266e06c1e6e12261768a28b8b41ba55c8076", + "sha256:7623b59876f49e61c2e283551cc3647616d2fbdc0b4d36d3d638aae8547ea681", + "sha256:7e17c0ee7192e54a10943f245dc79e36d9fe282418ea05b886e1c666063a7b54", + "sha256:820ae12a390c9cbb26bb44913c87fa2ff431a029a785642c1ff11fed0a095fcb", + "sha256:94833612d6fd18b57c359a127cbfd932d9150c1b72fea7c86ab58c2a77edd7c7", + "sha256:95ef534e3c22e5abbdbdd6f66b6ea9dac3ca3e34c5c632894f8625d13d084cbe", + "sha256:9c803a5113cfab7bbb912f75faa4fc1e4acff43e452c82560349fff64f852e1b", + "sha256:9e53fb834aae96e7b0dadd6e92c66e7dd9cdf08965340ed04c16813102a47fab", + "sha256:ab2f976336808fd5d539fdc26eb51f9aafc1f4b638e212ef6b6f05e753c8011d", + "sha256:ad1e33dc6b9787a6f0f3fd132859aa75626528b49cc1f9e429cdacb2608ad5f0", + "sha256:ae5184e99a060a5c80010a2d53c99aee76a3b0ad683d493e5f0620b5d86eeb75", + "sha256:aeb4e741782e236ee7dc1fb11ad94dc56aabaf02d21df0e79e0c21fe07c95741", + "sha256:b4ad32aed3bf5eea5ca5decc3d1bbc3d0ec5d4fbcd72a03cdad849458decbc63", + "sha256:b8ad363330557beac73159acfbeed220d5f1bfcd6b930302a987a375e02f74fd", + "sha256:bfbb18b616abc4df70591b8c1ff1b3eabd234ddcddb86b7cac82657ab9017e33", + "sha256:c1e51d1af306641b7d1574d6d3307eaa10a4991542ca324f0feb134fee259815", + "sha256:c31d281c7485223caf6474fc2b7cf21456289dbaa31401844069b77160cab9c7", + "sha256:c7e8988bb16988890c985bd2093df9dd731bfb9d5e0860db054c23034fab8f7a", + "sha256:c87cedb4680d1614f1d59d13fea353faf3afd41ba5c906a266f3f2e8c245d655", + "sha256:cafb9c938f61d1b182dfc7d44a7021326547b7b9cf695db5b68ec7b590214773", + "sha256:d2f89a719411cb234105735a520b7c077158a81e0fe1cb05a79c01fc5eb59d3c", + "sha256:d4b40c9e13a0b61583e5599e7950490c700297b4a375b55b2b592774332798b7", + "sha256:d4ecb515fa7cb0e46e163ecd9d52f9147ba57bc3633dca0e586cdb7a232db9e3", + "sha256:d8c209af63ccd7b22fba94b9024e8b7fd07feffee0001efae50dd99316b27768", + "sha256:db3b48d9283d80a314f7a682f7acae8422386de659fffaba454b77a083c3937d", + "sha256:e41b5b973e5c64f674b3b4720286ded184dcc26a691dd55f34391c62c6934688", + "sha256:e840e6b2026920fc3f250ea8ebfdedf6ea7a25b77bf04c6576178e681942ae0f", + "sha256:ebb249096d873593e014535ab07145498957091aa6ae92759a32d40cb9998e2e", + "sha256:f434160fb14b353caf634149baaf847206406471ba70e64657c1e8330277a991", + "sha256:fa43f362b46741df8f201bf3e7dff3569fa92069bcc7b4a740dea3602e27ab7a" ], "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==1.10.15" + "version": "==1.10.17" }, "pygments": { "hashes": [ @@ -1456,11 +1464,11 @@ }, "requests": { "hashes": [ - "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f", - "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" + "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760", + "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6" ], - "markers": "python_version >= '3.7'", - "version": "==2.31.0" + "markers": "python_version >= '3.8'", + "version": "==2.32.3" }, "rich": { "hashes": [ @@ -1480,19 +1488,19 @@ }, "s3transfer": { "hashes": [ - "sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19", - "sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d" + "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6", + "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69" ], "markers": "python_version >= '3.8'", - "version": "==0.10.1" + "version": "==0.10.2" }, "setuptools": { "hashes": [ - "sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987", - "sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32" + "sha256:937a48c7cdb7a21eb53cd7f9b59e525503aa8abaf3584c730dc5f7a5bec3a650", + "sha256:a58a8fde0541dab0419750bcc521fbdf8585f6e5cb41909df3a472ef7b81ca95" ], "markers": "python_version >= '3.8'", - "version": "==69.5.1" + "version": "==70.1.1" }, "shapely": { "hashes": [ @@ -1636,30 +1644,30 @@ }, "typing-extensions": { "hashes": [ - "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0", - "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a" + "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", + "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8" ], "markers": "python_version >= '3.8'", - "version": "==4.11.0" + "version": "==4.12.2" }, "urllib3": { "hashes": [ - "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d", - "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19" + "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472", + "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "markers": "python_version >= '3.10'", - "version": "==2.2.1" + "version": "==2.2.2" }, "uvicorn": { "extras": [ "standard" ], "hashes": [ - "sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de", - "sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0" + "sha256:cd17daa7f3b9d7a24de3617820e634d0933b69eed8e33a516071174427238c81", + "sha256:d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8" ], "markers": "python_version >= '3.8'", - "version": "==0.29.0" + "version": "==0.30.1" }, "uvloop": { "hashes": [ @@ -1699,83 +1707,83 @@ }, "watchfiles": { "hashes": [ - "sha256:02b73130687bc3f6bb79d8a170959042eb56eb3a42df3671c79b428cd73f17cc", - "sha256:02d91cbac553a3ad141db016e3350b03184deaafeba09b9d6439826ee594b365", - "sha256:06247538e8253975bdb328e7683f8515ff5ff041f43be6c40bff62d989b7d0b0", - "sha256:08dca260e85ffae975448e344834d765983237ad6dc308231aa16e7933db763e", - "sha256:0d9ac347653ebd95839a7c607608703b20bc07e577e870d824fa4801bc1cb124", - "sha256:0dd5fad9b9c0dd89904bbdea978ce89a2b692a7ee8a0ce19b940e538c88a809c", - "sha256:11cd0c3100e2233e9c53106265da31d574355c288e15259c0d40a4405cbae317", - "sha256:18722b50783b5e30a18a8a5db3006bab146d2b705c92eb9a94f78c72beb94094", - "sha256:18d5b4da8cf3e41895b34e8c37d13c9ed294954907929aacd95153508d5d89d7", - "sha256:1ad7247d79f9f55bb25ab1778fd47f32d70cf36053941f07de0b7c4e96b5d235", - "sha256:1b8d1eae0f65441963d805f766c7e9cd092f91e0c600c820c764a4ff71a0764c", - "sha256:1bd467213195e76f838caf2c28cd65e58302d0254e636e7c0fca81efa4a2e62c", - "sha256:1c9198c989f47898b2c22201756f73249de3748e0fc9de44adaf54a8b259cc0c", - "sha256:1fd9a5205139f3c6bb60d11f6072e0552f0a20b712c85f43d42342d162be1235", - "sha256:214cee7f9e09150d4fb42e24919a1e74d8c9b8a9306ed1474ecaddcd5479c293", - "sha256:27b4035013f1ea49c6c0b42d983133b136637a527e48c132d368eb19bf1ac6aa", - "sha256:3a23092a992e61c3a6a70f350a56db7197242f3490da9c87b500f389b2d01eef", - "sha256:3ad692bc7792be8c32918c699638b660c0de078a6cbe464c46e1340dadb94c19", - "sha256:3ccceb50c611c433145502735e0370877cced72a6c70fd2410238bcbc7fe51d8", - "sha256:3d0f32ebfaa9c6011f8454994f86108c2eb9c79b8b7de00b36d558cadcedaa3d", - "sha256:3f92944efc564867bbf841c823c8b71bb0be75e06b8ce45c084b46411475a915", - "sha256:40bca549fdc929b470dd1dbfcb47b3295cb46a6d2c90e50588b0a1b3bd98f429", - "sha256:43babacef21c519bc6631c5fce2a61eccdfc011b4bcb9047255e9620732c8097", - "sha256:4566006aa44cb0d21b8ab53baf4b9c667a0ed23efe4aaad8c227bfba0bf15cbe", - "sha256:49f56e6ecc2503e7dbe233fa328b2be1a7797d31548e7a193237dcdf1ad0eee0", - "sha256:4c48a10d17571d1275701e14a601e36959ffada3add8cdbc9e5061a6e3579a5d", - "sha256:4ea10a29aa5de67de02256a28d1bf53d21322295cb00bd2d57fcd19b850ebd99", - "sha256:511f0b034120cd1989932bf1e9081aa9fb00f1f949fbd2d9cab6264916ae89b1", - "sha256:51ddac60b96a42c15d24fbdc7a4bfcd02b5a29c047b7f8bf63d3f6f5a860949a", - "sha256:57d430f5fb63fea141ab71ca9c064e80de3a20b427ca2febcbfcef70ff0ce895", - "sha256:59137c0c6826bd56c710d1d2bda81553b5e6b7c84d5a676747d80caf0409ad94", - "sha256:5a03651352fc20975ee2a707cd2d74a386cd303cc688f407296064ad1e6d1562", - "sha256:5eb86c6acb498208e7663ca22dbe68ca2cf42ab5bf1c776670a50919a56e64ab", - "sha256:642d66b75eda909fd1112d35c53816d59789a4b38c141a96d62f50a3ef9b3360", - "sha256:6674b00b9756b0af620aa2a3346b01f8e2a3dc729d25617e1b89cf6af4a54eb1", - "sha256:668c265d90de8ae914f860d3eeb164534ba2e836811f91fecc7050416ee70aa7", - "sha256:66fac0c238ab9a2e72d026b5fb91cb902c146202bbd29a9a1a44e8db7b710b6f", - "sha256:6c107ea3cf2bd07199d66f156e3ea756d1b84dfd43b542b2d870b77868c98c03", - "sha256:6c889025f59884423428c261f212e04d438de865beda0b1e1babab85ef4c0f01", - "sha256:6cb8fdc044909e2078c248986f2fc76f911f72b51ea4a4fbbf472e01d14faa58", - "sha256:6e9be3ef84e2bb9710f3f777accce25556f4a71e15d2b73223788d528fcc2052", - "sha256:7f762a1a85a12cc3484f77eee7be87b10f8c50b0b787bb02f4e357403cad0c0e", - "sha256:83a696da8922314ff2aec02987eefb03784f473281d740bf9170181829133765", - "sha256:853853cbf7bf9408b404754b92512ebe3e3a83587503d766d23e6bf83d092ee6", - "sha256:8ad3fe0a3567c2f0f629d800409cd528cb6251da12e81a1f765e5c5345fd0137", - "sha256:8c6ed10c2497e5fedadf61e465b3ca12a19f96004c15dcffe4bd442ebadc2d85", - "sha256:8d5f400326840934e3507701f9f7269247f7c026d1b6cfd49477d2be0933cfca", - "sha256:927c589500f9f41e370b0125c12ac9e7d3a2fd166b89e9ee2828b3dda20bfe6f", - "sha256:9a0aa47f94ea9a0b39dd30850b0adf2e1cd32a8b4f9c7aa443d852aacf9ca214", - "sha256:9b37a7ba223b2f26122c148bb8d09a9ff312afca998c48c725ff5a0a632145f7", - "sha256:9c873345680c1b87f1e09e0eaf8cf6c891b9851d8b4d3645e7efe2ec20a20cc7", - "sha256:9d09869f2c5a6f2d9df50ce3064b3391d3ecb6dced708ad64467b9e4f2c9bef3", - "sha256:9d353c4cfda586db2a176ce42c88f2fc31ec25e50212650c89fdd0f560ee507b", - "sha256:a1e3014a625bcf107fbf38eece0e47fa0190e52e45dc6eee5a8265ddc6dc5ea7", - "sha256:a3b9bec9579a15fb3ca2d9878deae789df72f2b0fdaf90ad49ee389cad5edab6", - "sha256:ab03a90b305d2588e8352168e8c5a1520b721d2d367f31e9332c4235b30b8994", - "sha256:aff06b2cac3ef4616e26ba17a9c250c1fe9dd8a5d907d0193f84c499b1b6e6a9", - "sha256:b3cab0e06143768499384a8a5efb9c4dc53e19382952859e4802f294214f36ec", - "sha256:b4a21f71885aa2744719459951819e7bf5a906a6448a6b2bbce8e9cc9f2c8128", - "sha256:b6d45d9b699ecbac6c7bd8e0a2609767491540403610962968d258fd6405c17c", - "sha256:be6dd5d52b73018b21adc1c5d28ac0c68184a64769052dfeb0c5d9998e7f56a2", - "sha256:c550a56bf209a3d987d5a975cdf2063b3389a5d16caf29db4bdddeae49f22078", - "sha256:c76c635fabf542bb78524905718c39f736a98e5ab25b23ec6d4abede1a85a6a3", - "sha256:c81818595eff6e92535ff32825f31c116f867f64ff8cdf6562cd1d6b2e1e8f3e", - "sha256:cfb92d49dbb95ec7a07511bc9efb0faff8fe24ef3805662b8d6808ba8409a71a", - "sha256:d23bcd6c8eaa6324fe109d8cac01b41fe9a54b8c498af9ce464c1aeeb99903d6", - "sha256:d5b1dc0e708fad9f92c296ab2f948af403bf201db8fb2eb4c8179db143732e49", - "sha256:d78f30cbe8b2ce770160d3c08cff01b2ae9306fe66ce899b73f0409dc1846c1b", - "sha256:d8f57c4461cd24fda22493109c45b3980863c58a25b8bec885ca8bea6b8d4b28", - "sha256:d9792dff410f266051025ecfaa927078b94cc7478954b06796a9756ccc7e14a9", - "sha256:e7941bbcfdded9c26b0bf720cb7e6fd803d95a55d2c14b4bd1f6a2772230c586", - "sha256:ebe684d7d26239e23d102a2bad2a358dedf18e462e8808778703427d1f584400", - "sha256:ec8c8900dc5c83650a63dd48c4d1d245343f904c4b64b48798c67a3767d7e165", - "sha256:f564bf68404144ea6b87a78a3f910cc8de216c6b12a4cf0b27718bf4ec38d303", - "sha256:fd7ac678b92b29ba630d8c842d8ad6c555abda1b9ef044d6cc092dacbfc9719d" - ], - "version": "==0.21.0" + "sha256:00095dd368f73f8f1c3a7982a9801190cc88a2f3582dd395b289294f8975172b", + "sha256:00ad0bcd399503a84cc688590cdffbe7a991691314dde5b57b3ed50a41319a31", + "sha256:00f39592cdd124b4ec5ed0b1edfae091567c72c7da1487ae645426d1b0ffcad1", + "sha256:030bc4e68d14bcad2294ff68c1ed87215fbd9a10d9dea74e7cfe8a17869785ab", + "sha256:052d668a167e9fc345c24203b104c313c86654dd6c0feb4b8a6dfc2462239249", + "sha256:067dea90c43bf837d41e72e546196e674f68c23702d3ef80e4e816937b0a3ffd", + "sha256:0b04a2cbc30e110303baa6d3ddce8ca3664bc3403be0f0ad513d1843a41c97d1", + "sha256:0bc3b2f93a140df6806c8467c7f51ed5e55a931b031b5c2d7ff6132292e803d6", + "sha256:0c8e0aa0e8cc2a43561e0184c0513e291ca891db13a269d8d47cb9841ced7c71", + "sha256:103622865599f8082f03af4214eaff90e2426edff5e8522c8f9e93dc17caee13", + "sha256:1235c11510ea557fe21be5d0e354bae2c655a8ee6519c94617fe63e05bca4171", + "sha256:1cc0cba54f47c660d9fa3218158b8963c517ed23bd9f45fe463f08262a4adae1", + "sha256:1d9188979a58a096b6f8090e816ccc3f255f137a009dd4bbec628e27696d67c1", + "sha256:213792c2cd3150b903e6e7884d40660e0bcec4465e00563a5fc03f30ea9c166c", + "sha256:25c817ff2a86bc3de3ed2df1703e3d24ce03479b27bb4527c57e722f8554d971", + "sha256:2627a91e8110b8de2406d8b2474427c86f5a62bf7d9ab3654f541f319ef22bcb", + "sha256:280a4afbc607cdfc9571b9904b03a478fc9f08bbeec382d648181c695648202f", + "sha256:28324d6b28bcb8d7c1041648d7b63be07a16db5510bea923fc80b91a2a6cbed6", + "sha256:28585744c931576e535860eaf3f2c0ec7deb68e3b9c5a85ca566d69d36d8dd27", + "sha256:28f393c1194b6eaadcdd8f941307fc9bbd7eb567995232c830f6aef38e8a6e88", + "sha256:2abeb79209630da981f8ebca30a2c84b4c3516a214451bfc5f106723c5f45843", + "sha256:2bdadf6b90c099ca079d468f976fd50062905d61fae183f769637cb0f68ba59a", + "sha256:2f350cbaa4bb812314af5dab0eb8d538481e2e2279472890864547f3fe2281ed", + "sha256:3218a6f908f6a276941422b035b511b6d0d8328edd89a53ae8c65be139073f84", + "sha256:3973145235a38f73c61474d56ad6199124e7488822f3a4fc97c72009751ae3b0", + "sha256:3a0d883351a34c01bd53cfa75cd0292e3f7e268bacf2f9e33af4ecede7e21d1d", + "sha256:425440e55cd735386ec7925f64d5dde392e69979d4c8459f6bb4e920210407f2", + "sha256:4b9f2a128a32a2c273d63eb1fdbf49ad64852fc38d15b34eaa3f7ca2f0d2b797", + "sha256:4cc382083afba7918e32d5ef12321421ef43d685b9a67cc452a6e6e18920890e", + "sha256:52fc9b0dbf54d43301a19b236b4a4614e610605f95e8c3f0f65c3a456ffd7d35", + "sha256:55b7cc10261c2786c41d9207193a85c1db1b725cf87936df40972aab466179b6", + "sha256:581f0a051ba7bafd03e17127735d92f4d286af941dacf94bcf823b101366249e", + "sha256:5834e1f8b71476a26df97d121c0c0ed3549d869124ed2433e02491553cb468c2", + "sha256:5e45fb0d70dda1623a7045bd00c9e036e6f1f6a85e4ef2c8ae602b1dfadf7550", + "sha256:61af9efa0733dc4ca462347becb82e8ef4945aba5135b1638bfc20fad64d4f0e", + "sha256:68fe0c4d22332d7ce53ad094622b27e67440dacefbaedd29e0794d26e247280c", + "sha256:72a44e9481afc7a5ee3291b09c419abab93b7e9c306c9ef9108cb76728ca58d2", + "sha256:7a74436c415843af2a769b36bf043b6ccbc0f8d784814ba3d42fc961cdb0a9dc", + "sha256:8597b6f9dc410bdafc8bb362dac1cbc9b4684a8310e16b1ff5eee8725d13dcd6", + "sha256:8c39987a1397a877217be1ac0fb1d8b9f662c6077b90ff3de2c05f235e6a8f96", + "sha256:8c3e3675e6e39dc59b8fe5c914a19d30029e36e9f99468dddffd432d8a7b1c93", + "sha256:8dc1fc25a1dedf2dd952909c8e5cb210791e5f2d9bc5e0e8ebc28dd42fed7562", + "sha256:8fdebb655bb1ba0122402352b0a4254812717a017d2dc49372a1d47e24073795", + "sha256:9165bcab15f2b6d90eedc5c20a7f8a03156b3773e5fb06a790b54ccecdb73385", + "sha256:94ebe84a035993bb7668f58a0ebf998174fb723a39e4ef9fce95baabb42b787f", + "sha256:9624a68b96c878c10437199d9a8b7d7e542feddda8d5ecff58fdc8e67b460848", + "sha256:96eec15e5ea7c0b6eb5bfffe990fc7c6bd833acf7e26704eb18387fb2f5fd087", + "sha256:97b94e14b88409c58cdf4a8eaf0e67dfd3ece7e9ce7140ea6ff48b0407a593ec", + "sha256:988e981aaab4f3955209e7e28c7794acdb690be1efa7f16f8ea5aba7ffdadacb", + "sha256:a8a31bfd98f846c3c284ba694c6365620b637debdd36e46e1859c897123aa232", + "sha256:a927b3034d0672f62fb2ef7ea3c9fc76d063c4b15ea852d1db2dc75fe2c09696", + "sha256:ace7d060432acde5532e26863e897ee684780337afb775107c0a90ae8dbccfd2", + "sha256:aec83c3ba24c723eac14225194b862af176d52292d271c98820199110e31141e", + "sha256:b44b70850f0073b5fcc0b31ede8b4e736860d70e2dbf55701e05d3227a154a67", + "sha256:b610fb5e27825b570554d01cec427b6620ce9bd21ff8ab775fc3a32f28bba63e", + "sha256:b810a2c7878cbdecca12feae2c2ae8af59bea016a78bc353c184fa1e09f76b68", + "sha256:bbf8a20266136507abf88b0df2328e6a9a7c7309e8daff124dda3803306a9fdb", + "sha256:bd4c06100bce70a20c4b81e599e5886cf504c9532951df65ad1133e508bf20be", + "sha256:c2444dc7cb9d8cc5ab88ebe792a8d75709d96eeef47f4c8fccb6df7c7bc5be71", + "sha256:c49b76a78c156979759d759339fb62eb0549515acfe4fd18bb151cc07366629c", + "sha256:c4a65474fd2b4c63e2c18ac67a0c6c66b82f4e73e2e4d940f837ed3d2fd9d4da", + "sha256:c5af2347d17ab0bd59366db8752d9e037982e259cacb2ba06f2c41c08af02c39", + "sha256:c668228833c5619f6618699a2c12be057711b0ea6396aeaece4ded94184304ea", + "sha256:c7b978c384e29d6c7372209cbf421d82286a807bbcdeb315427687f8371c340a", + "sha256:d048ad5d25b363ba1d19f92dcf29023988524bee6f9d952130b316c5802069cb", + "sha256:d3e1f3cf81f1f823e7874ae563457828e940d75573c8fbf0ee66818c8b6a9099", + "sha256:d47e9ef1a94cc7a536039e46738e17cce058ac1593b2eccdede8bf72e45f372a", + "sha256:da1e0a8caebf17976e2ffd00fa15f258e14749db5e014660f53114b676e68538", + "sha256:dc1b9b56f051209be458b87edb6856a449ad3f803315d87b2da4c93b43a6fe72", + "sha256:dc2e8fe41f3cac0660197d95216c42910c2b7e9c70d48e6d84e22f577d106fc1", + "sha256:dc92d2d2706d2b862ce0568b24987eba51e17e14b79a1abcd2edc39e48e743c8", + "sha256:dd64f3a4db121bc161644c9e10a9acdb836853155a108c2446db2f5ae1778c3d", + "sha256:e0f0a874231e2839abbf473256efffe577d6ee2e3bfa5b540479e892e47c172d", + "sha256:f7e1f9c5d1160d03b93fc4b68a0aeb82fe25563e12fbcdc8507f8434ab6f823c", + "sha256:fe82d13461418ca5e5a808a9e40f79c1879351fcaeddbede094028e74d836e86" + ], + "version": "==0.22.0" }, "websockets": { "hashes": [ @@ -1999,29 +2007,29 @@ }, "boto3": { "hashes": [ - "sha256:58d097241f3895c4a4c80c9e606689c6e06d77f55f9f53a4cc02dee7e03938b9", - "sha256:59b6499f1bb423dd99de6566a20d0a7cf1a5476824be3a792290fd86600e8365" + "sha256:342782c02ff077aae118c9c61179eed95c585831fba666baacc5588ff04aa6e1", + "sha256:f6d6e5b0c9ab022a75373fa16c01f0cd54bc1bb64ef3b6ac64ac7cedd56cbe9c" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==1.34.103" + "version": "==1.34.134" }, "botocore": { "hashes": [ - "sha256:0330d139f18f78d38127e65361859e24ebd6a8bcba184f903c01bb999a3fa431", - "sha256:5f07e2c7302c0a9f469dcd08b4ddac152e9f5888b12220242c20056255010939" + "sha256:45219e00639755f92569b29f8f279d5dde721494791412c1f7026a3779e8d9f4", + "sha256:e29c299599426ed16dd2d4c1e20eef784f96b15e1850ebbc59a3250959285b95" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==1.34.103" + "version": "==1.34.134" }, "certifi": { "hashes": [ - "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f", - "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1" + "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516", + "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56" ], "markers": "python_version >= '3.6'", - "version": "==2024.2.2" + "version": "==2024.6.2" }, "cffi": { "hashes": [ @@ -2213,99 +2221,99 @@ "toml" ], "hashes": [ - "sha256:0646599e9b139988b63704d704af8e8df7fa4cbc4a1f33df69d97f36cb0a38de", - "sha256:0cdcbc320b14c3e5877ee79e649677cb7d89ef588852e9583e6b24c2e5072661", - "sha256:0d0a0f5e06881ecedfe6f3dd2f56dcb057b6dbeb3327fd32d4b12854df36bf26", - "sha256:1434e088b41594baa71188a17533083eabf5609e8e72f16ce8c186001e6b8c41", - "sha256:16db7f26000a07efcf6aea00316f6ac57e7d9a96501e990a36f40c965ec7a95d", - "sha256:1cc0fe9b0b3a8364093c53b0b4c0c2dd4bb23acbec4c9240b5f284095ccf7981", - "sha256:1fc81d5878cd6274ce971e0a3a18a8803c3fe25457165314271cf78e3aae3aa2", - "sha256:2ec92012fefebee89a6b9c79bc39051a6cb3891d562b9270ab10ecfdadbc0c34", - "sha256:39afcd3d4339329c5f58de48a52f6e4e50f6578dd6099961cf22228feb25f38f", - "sha256:4a7b0ceee8147444347da6a66be737c9d78f3353b0681715b668b72e79203e4a", - "sha256:4a9ca3f2fae0088c3c71d743d85404cec8df9be818a005ea065495bedc33da35", - "sha256:4bf0655ab60d754491004a5efd7f9cccefcc1081a74c9ef2da4735d6ee4a6223", - "sha256:4cc37def103a2725bc672f84bd939a6fe4522310503207aae4d56351644682f1", - "sha256:4fc84a37bfd98db31beae3c2748811a3fa72bf2007ff7902f68746d9757f3746", - "sha256:5037f8fcc2a95b1f0e80585bd9d1ec31068a9bcb157d9750a172836e98bc7a90", - "sha256:54de9ef3a9da981f7af93eafde4ede199e0846cd819eb27c88e2b712aae9708c", - "sha256:556cf1a7cbc8028cb60e1ff0be806be2eded2daf8129b8811c63e2b9a6c43bca", - "sha256:57e0204b5b745594e5bc14b9b50006da722827f0b8c776949f1135677e88d0b8", - "sha256:5a5740d1fb60ddf268a3811bcd353de34eb56dc24e8f52a7f05ee513b2d4f596", - "sha256:5c3721c2c9e4c4953a41a26c14f4cef64330392a6d2d675c8b1db3b645e31f0e", - "sha256:5fa567e99765fe98f4e7d7394ce623e794d7cabb170f2ca2ac5a4174437e90dd", - "sha256:5fd215c0c7d7aab005221608a3c2b46f58c0285a819565887ee0b718c052aa4e", - "sha256:6175d1a0559986c6ee3f7fccfc4a90ecd12ba0a383dcc2da30c2b9918d67d8a3", - "sha256:61c4bf1ba021817de12b813338c9be9f0ad5b1e781b9b340a6d29fc13e7c1b5e", - "sha256:6537e7c10cc47c595828b8a8be04c72144725c383c4702703ff4e42e44577312", - "sha256:68f962d9b72ce69ea8621f57551b2fa9c70509af757ee3b8105d4f51b92b41a7", - "sha256:7352b9161b33fd0b643ccd1f21f3a3908daaddf414f1c6cb9d3a2fd618bf2572", - "sha256:796a79f63eca8814ca3317a1ea443645c9ff0d18b188de470ed7ccd45ae79428", - "sha256:79afb6197e2f7f60c4824dd4b2d4c2ec5801ceb6ba9ce5d2c3080e5660d51a4f", - "sha256:7a588d39e0925f6a2bff87154752481273cdb1736270642aeb3635cb9b4cad07", - "sha256:8748731ad392d736cc9ccac03c9845b13bb07d020a33423fa5b3a36521ac6e4e", - "sha256:8fe7502616b67b234482c3ce276ff26f39ffe88adca2acf0261df4b8454668b4", - "sha256:9314d5678dcc665330df5b69c1e726a0e49b27df0461c08ca12674bcc19ef136", - "sha256:9735317685ba6ec7e3754798c8871c2f49aa5e687cc794a0b1d284b2389d1bd5", - "sha256:9981706d300c18d8b220995ad22627647be11a4276721c10911e0e9fa44c83e8", - "sha256:9e78295f4144f9dacfed4f92935fbe1780021247c2fabf73a819b17f0ccfff8d", - "sha256:b016ea6b959d3b9556cb401c55a37547135a587db0115635a443b2ce8f1c7228", - "sha256:b6cf3764c030e5338e7f61f95bd21147963cf6aa16e09d2f74f1fa52013c1206", - "sha256:beccf7b8a10b09c4ae543582c1319c6df47d78fd732f854ac68d518ee1fb97fa", - "sha256:c0884920835a033b78d1c73b6d3bbcda8161a900f38a488829a83982925f6c2e", - "sha256:c3e757949f268364b96ca894b4c342b41dc6f8f8b66c37878aacef5930db61be", - "sha256:ca498687ca46a62ae590253fba634a1fe9836bc56f626852fb2720f334c9e4e5", - "sha256:d1d0d98d95dd18fe29dc66808e1accf59f037d5716f86a501fc0256455219668", - "sha256:d21918e9ef11edf36764b93101e2ae8cc82aa5efdc7c5a4e9c6c35a48496d601", - "sha256:d7fed867ee50edf1a0b4a11e8e5d0895150e572af1cd6d315d557758bfa9c057", - "sha256:db66fc317a046556a96b453a58eced5024af4582a8dbdc0c23ca4dbc0d5b3146", - "sha256:dde0070c40ea8bb3641e811c1cfbf18e265d024deff6de52c5950677a8fb1e0f", - "sha256:df4e745a81c110e7446b1cc8131bf986157770fa405fe90e15e850aaf7619bc8", - "sha256:e2213def81a50519d7cc56ed643c9e93e0247f5bbe0d1247d15fa520814a7cd7", - "sha256:ef48e2707fb320c8f139424a596f5b69955a85b178f15af261bab871873bb987", - "sha256:f152cbf5b88aaeb836127d920dd0f5e7edff5a66f10c079157306c4343d86c19", - "sha256:fc0b4d8bfeabd25ea75e94632f5b6e047eef8adaed0c2161ada1e922e7f7cece" + "sha256:018a12985185038a5b2bcafab04ab833a9a0f2c59995b3cec07e10074c78635f", + "sha256:02ff6e898197cc1e9fa375581382b72498eb2e6d5fc0b53f03e496cfee3fac6d", + "sha256:042183de01f8b6d531e10c197f7f0315a61e8d805ab29c5f7b51a01d62782747", + "sha256:1014fbf665fef86cdfd6cb5b7371496ce35e4d2a00cda501cf9f5b9e6fced69f", + "sha256:1137f46adb28e3813dec8c01fefadcb8c614f33576f672962e323b5128d9a68d", + "sha256:16852febd96acd953b0d55fc842ce2dac1710f26729b31c80b940b9afcd9896f", + "sha256:2174e7c23e0a454ffe12267a10732c273243b4f2d50d07544a91198f05c48f47", + "sha256:2214ee920787d85db1b6a0bd9da5f8503ccc8fcd5814d90796c2f2493a2f4d2e", + "sha256:3257fdd8e574805f27bb5342b77bc65578e98cbc004a92232106344053f319ba", + "sha256:3684bc2ff328f935981847082ba4fdc950d58906a40eafa93510d1b54c08a66c", + "sha256:3a6612c99081d8d6134005b1354191e103ec9705d7ba2754e848211ac8cacc6b", + "sha256:3d7564cc09dd91b5a6001754a5b3c6ecc4aba6323baf33a12bd751036c998be4", + "sha256:44da56a2589b684813f86d07597fdf8a9c6ce77f58976727329272f5a01f99f7", + "sha256:5013ed890dc917cef2c9f765c4c6a8ae9df983cd60dbb635df8ed9f4ebc9f555", + "sha256:54317c2b806354cbb2dc7ac27e2b93f97096912cc16b18289c5d4e44fc663233", + "sha256:56b4eafa21c6c175b3ede004ca12c653a88b6f922494b023aeb1e836df953ace", + "sha256:581ea96f92bf71a5ec0974001f900db495488434a6928a2ca7f01eee20c23805", + "sha256:5cd64adedf3be66f8ccee418473c2916492d53cbafbfcff851cbec5a8454b136", + "sha256:5df54843b88901fdc2f598ac06737f03d71168fd1175728054c8f5a2739ac3e4", + "sha256:65e528e2e921ba8fd67d9055e6b9f9e34b21ebd6768ae1c1723f4ea6ace1234d", + "sha256:6aae5cce399a0f065da65c7bb1e8abd5c7a3043da9dceb429ebe1b289bc07806", + "sha256:6cfb5a4f556bb51aba274588200a46e4dd6b505fb1a5f8c5ae408222eb416f99", + "sha256:7076b4b3a5f6d2b5d7f1185fde25b1e54eb66e647a1dfef0e2c2bfaf9b4c88c8", + "sha256:73ca8fbc5bc622e54627314c1a6f1dfdd8db69788f3443e752c215f29fa87a0b", + "sha256:79b356f3dd5b26f3ad23b35c75dbdaf1f9e2450b6bcefc6d0825ea0aa3f86ca5", + "sha256:7a892be37ca35eb5019ec85402c3371b0f7cda5ab5056023a7f13da0961e60da", + "sha256:8192794d120167e2a64721d88dbd688584675e86e15d0569599257566dec9bf0", + "sha256:820bc841faa502e727a48311948e0461132a9c8baa42f6b2b84a29ced24cc078", + "sha256:8f894208794b164e6bd4bba61fc98bf6b06be4d390cf2daacfa6eca0a6d2bb4f", + "sha256:a04e990a2a41740b02d6182b498ee9796cf60eefe40cf859b016650147908029", + "sha256:a44963520b069e12789d0faea4e9fdb1e410cdc4aab89d94f7f55cbb7fef0353", + "sha256:a6bb74ed465d5fb204b2ec41d79bcd28afccf817de721e8a807d5141c3426638", + "sha256:ab73b35e8d109bffbda9a3e91c64e29fe26e03e49addf5b43d85fc426dde11f9", + "sha256:aea072a941b033813f5e4814541fc265a5c12ed9720daef11ca516aeacd3bd7f", + "sha256:b1ccf5e728ccf83acd313c89f07c22d70d6c375a9c6f339233dcf792094bcbf7", + "sha256:b385d49609f8e9efc885790a5a0e89f2e3ae042cdf12958b6034cc442de428d3", + "sha256:b3d45ff86efb129c599a3b287ae2e44c1e281ae0f9a9bad0edc202179bcc3a2e", + "sha256:b4a474f799456e0eb46d78ab07303286a84a3140e9700b9e154cfebc8f527016", + "sha256:b95c3a8cb0463ba9f77383d0fa8c9194cf91f64445a63fc26fb2327e1e1eb088", + "sha256:c5986ee7ea0795a4095ac4d113cbb3448601efca7f158ec7f7087a6c705304e4", + "sha256:cdd31315fc20868c194130de9ee6bfd99755cc9565edff98ecc12585b90be882", + "sha256:cef4649ec906ea7ea5e9e796e68b987f83fa9a718514fe147f538cfeda76d7a7", + "sha256:d05c16cf4b4c2fc880cb12ba4c9b526e9e5d5bb1d81313d4d732a5b9fe2b9d53", + "sha256:d2e344d6adc8ef81c5a233d3a57b3c7d5181f40e79e05e1c143da143ccb6377d", + "sha256:d45d3cbd94159c468b9b8c5a556e3f6b81a8d1af2a92b77320e887c3e7a5d080", + "sha256:db14f552ac38f10758ad14dd7b983dbab424e731588d300c7db25b6f89e335b5", + "sha256:dbc5958cb471e5a5af41b0ddaea96a37e74ed289535e8deca404811f6cb0bc3d", + "sha256:ddbd2f9713a79e8e7242d7c51f1929611e991d855f414ca9996c20e44a895f7c", + "sha256:e16f3d6b491c48c5ae726308e6ab1e18ee830b4cdd6913f2d7f77354b33f91c8", + "sha256:e2afe743289273209c992075a5a4913e8d007d569a406ffed0bd080ea02b0633", + "sha256:e564c2cf45d2f44a9da56f4e3a26b2236504a496eb4cb0ca7221cd4cc7a9aca9", + "sha256:ed550e7442f278af76d9d65af48069f1fb84c9f745ae249c1a183c1e9d1b025c" ], "markers": "python_version >= '3.8'", - "version": "==7.5.1" + "version": "==7.5.4" }, "cryptography": { "hashes": [ - "sha256:02c0eee2d7133bdbbc5e24441258d5d2244beb31da5ed19fbb80315f4bbbff55", - "sha256:0d563795db98b4cd57742a78a288cdbdc9daedac29f2239793071fe114f13785", - "sha256:16268d46086bb8ad5bf0a2b5544d8a9ed87a0e33f5e77dd3c3301e63d941a83b", - "sha256:1a58839984d9cb34c855197043eaae2c187d930ca6d644612843b4fe8513c886", - "sha256:2954fccea107026512b15afb4aa664a5640cd0af630e2ee3962f2602693f0c82", - "sha256:2e47577f9b18723fa294b0ea9a17d5e53a227867a0a4904a1a076d1646d45ca1", - "sha256:31adb7d06fe4383226c3e963471f6837742889b3c4caa55aac20ad951bc8ffda", - "sha256:3577d029bc3f4827dd5bf8bf7710cac13527b470bbf1820a3f394adb38ed7d5f", - "sha256:36017400817987670037fbb0324d71489b6ead6231c9604f8fc1f7d008087c68", - "sha256:362e7197754c231797ec45ee081f3088a27a47c6c01eff2ac83f60f85a50fe60", - "sha256:3de9a45d3b2b7d8088c3fbf1ed4395dfeff79d07842217b38df14ef09ce1d8d7", - "sha256:4f698edacf9c9e0371112792558d2f705b5645076cc0aaae02f816a0171770fd", - "sha256:5482e789294854c28237bba77c4c83be698be740e31a3ae5e879ee5444166582", - "sha256:5e44507bf8d14b36b8389b226665d597bc0f18ea035d75b4e53c7b1ea84583cc", - "sha256:779245e13b9a6638df14641d029add5dc17edbef6ec915688f3acb9e720a5858", - "sha256:789caea816c6704f63f6241a519bfa347f72fbd67ba28d04636b7c6b7da94b0b", - "sha256:7f8b25fa616d8b846aef64b15c606bb0828dbc35faf90566eb139aa9cff67af2", - "sha256:8cb8ce7c3347fcf9446f201dc30e2d5a3c898d009126010cbd1f443f28b52678", - "sha256:93a3209f6bb2b33e725ed08ee0991b92976dfdcf4e8b38646540674fc7508e13", - "sha256:a3a5ac8b56fe37f3125e5b72b61dcde43283e5370827f5233893d461b7360cd4", - "sha256:a47787a5e3649008a1102d3df55424e86606c9bae6fb77ac59afe06d234605f8", - "sha256:a79165431551042cc9d1d90e6145d5d0d3ab0f2d66326c201d9b0e7f5bf43604", - "sha256:a987f840718078212fdf4504d0fd4c6effe34a7e4740378e59d47696e8dfb477", - "sha256:a9bc127cdc4ecf87a5ea22a2556cab6c7eda2923f84e4f3cc588e8470ce4e42e", - "sha256:bd13b5e9b543532453de08bcdc3cc7cebec6f9883e886fd20a92f26940fd3e7a", - "sha256:c65f96dad14f8528a447414125e1fc8feb2ad5a272b8f68477abbcc1ea7d94b9", - "sha256:d8e3098721b84392ee45af2dd554c947c32cc52f862b6a3ae982dbb90f577f14", - "sha256:e6b79d0adb01aae87e8a44c2b64bc3f3fe59515280e00fb6d57a7267a2583cda", - "sha256:e6b8f1881dac458c34778d0a424ae5769de30544fc678eac51c1c8bb2183e9da", - "sha256:e9b2a6309f14c0497f348d08a065d52f3020656f675819fc405fb63bbcd26562", - "sha256:ecbfbc00bf55888edda9868a4cf927205de8499e7fabe6c050322298382953f2", - "sha256:efd0bf5205240182e0f13bcaea41be4fdf5c22c5129fc7ced4a0282ac86998c9" + "sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad", + "sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583", + "sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b", + "sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c", + "sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1", + "sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648", + "sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949", + "sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba", + "sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c", + "sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9", + "sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d", + "sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c", + "sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e", + "sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2", + "sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d", + "sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7", + "sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70", + "sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2", + "sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7", + "sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14", + "sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe", + "sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e", + "sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71", + "sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961", + "sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7", + "sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c", + "sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28", + "sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842", + "sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902", + "sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801", + "sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a", + "sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e" ], "markers": "python_version >= '3.7'", - "version": "==42.0.7" + "version": "==42.0.8" }, "detect-secrets": { "hashes": [ @@ -2324,12 +2332,12 @@ }, "docker": { "hashes": [ - "sha256:12ba681f2777a0ad28ffbcc846a69c31b4dfd9752b47eb425a274ee269c5e14b", - "sha256:323736fb92cd9418fc5e7133bc953e11a9da04f4483f828b527db553f1e7e5a3" + "sha256:ad8c70e6e3f8926cb8a92619b832b4ea5299e2831c14284663184e200546fa6c", + "sha256:c96b93b7f0a746f9e77d325bcfb87422a3d8bd4f03136ae8a85b37f1898d5fc0" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==7.0.0" + "version": "==7.1.0" }, "ecdsa": { "hashes": [ @@ -2349,59 +2357,29 @@ }, "filelock": { "hashes": [ - "sha256:43339835842f110ca7ae60f1e1c160714c5a6afd15a2873419ab185334975c0f", - "sha256:6ea72da3be9b8c82afd3edcf99f2fffbb5076335a5ae4d03248bb5b6c3eae78a" + "sha256:2207938cbc1844345cb01a5a95524dae30f0ce089eba5b00378295a17e3e90cb", + "sha256:6ca1fffae96225dab4c6eaf1c4f4f28cd2568d3ec2a44e15a08520504de468e7" ], "markers": "python_version >= '3.8'", - "version": "==3.14.0" - }, - "fiona": { - "hashes": [ - "sha256:0eaffbf3bfae9960484c0c08ea461b0c40e111497f04e9475ebf15ac7a22d9dc", - "sha256:11af1afc1255642a7787fe112c29d01f968f1053e4d4700fc6f3bb879c1622e0", - "sha256:1dcd6eca7524535baf2a39d7981b4a46d33ae28c313934a7c3eae62eecf9dfa5", - "sha256:39819fb8f5ec6d9971cb01b912b4431615a3d3f50c83798565d8ce41917930db", - "sha256:42d8a0e5570948d3821c493b6141866d9a4d7a64edad2be4ecbb89f81904baac", - "sha256:48b6218224e96de5e36b5eb259f37160092260e5de0dcd82ca200b1887aa9884", - "sha256:50037c3b7a5f6f434b562b5b1a5b664f1caa7a4383b00af23cdb59bfc6ba852c", - "sha256:52e8fec650b72fc5253d8f86b63859acc687182281c29bfacd3930496cf982d1", - "sha256:53bedd2989e255df1bf3378ae9c06d6d241ec273c280c544bb44ffffebb97fb0", - "sha256:63e528b5ea3d8b1038d788e7c65117835c787ba7fdc94b1b42f09c2cbc0aaff2", - "sha256:77653a08564a44e634c44cd74a068d2f55d1d4029edd16d1c8aadcc4d8cc1d2c", - "sha256:791b3494f8b218c06ea56f892bd6ba893dfa23525347761d066fb7738acda3b1", - "sha256:89095c2d542325ee45894b8837e8048cdbb2f22274934e1be3b673ca628010d7", - "sha256:918bd27d8625416672e834593970f96dff63215108f81efb876fe5c0bc58a3b4", - "sha256:98cea6f435843b2119731c6b0470e5b7386aa16b6aa7edabbf1ed93aefe029c3", - "sha256:9b53034efdf93ada9295b081e6a8280af7c75496a20df82d4c2ca46d65b85905", - "sha256:bf51846ad602757bf27876f458c5c9f14b09421fac612f64273cc4e3fcabc441", - "sha256:c1dd5fbc29b7303bb87eb683455e8451e1a53bb8faf20ef97fdcd843c9e4a7f6", - "sha256:c9b92aa1badb2773e7cac19bef3064d73e9d80c67c42f0928db2520a04be6f2f", - "sha256:e313210b30d09ed8f829bf625599e248dadd78622728030221f6526580ff26c5", - "sha256:e5404ed08c711489abcb3a50a184816825b8af06eb73ad2a99e18b8e7b47c96a", - "sha256:e7617563b36d2be99f048f0d0054b4d765f4aae454398f88f19de9c2c324b7f8", - "sha256:f1b49d51a744874608b689f029766aa1e078dd72e94b44cf8eeef6d7bd2e9051", - "sha256:f4230eccbd896a79d1ebfa551d84bf90f512f7bcbe1ca61e3f82231321f1a532" - ], - "markers": "python_version >= '3.7'", - "version": "==1.9.6" + "version": "==3.15.4" }, "flake8": { "hashes": [ - "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132", - "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3" + "sha256:2e416edcc62471a64cea09353f4e7bdba32aeb079b6e360554c659a122b1bc6a", + "sha256:48a07b626b55236e0fb4784ee69a465fbf59d79eec1f5b4785c3d3bc57d17aa5" ], "index": "pypi", "markers": "python_full_version >= '3.8.1'", - "version": "==7.0.0" + "version": "==7.1.0" }, "geopandas": { "hashes": [ - "sha256:3bb6473cb59d51e1a7fe2dbc24a1a063fb0ebdeddf3ce08ddbf8c7ddc99689aa", - "sha256:56765be9d58e2c743078085db3bd07dc6be7719f0dbe1dfdc1d705cb80be7c25" + "sha256:386d42c028047e2b0f09191d7859268304761c4711a247173a88891b6161f711", + "sha256:cdd3ddf3c9f978997c7f08d0c544b6f887c94af4bc2e01e3df3ae69a43510df3" ], "index": "pypi", "markers": "python_version >= '3.9'", - "version": "==0.14.4" + "version": "==1.0.0" }, "gfw-pixetl": { "git": "https://github.com/wri/gfw_pixetl.git", @@ -2457,11 +2435,11 @@ }, "jsonschema-path": { "hashes": [ - "sha256:271aedfefcd161a0f467bdf23e1d9183691a61eaabf4b761046a914e369336c7", - "sha256:4d0dababf341e36e9b91a5fb2a3e3fd300b0150e7fe88df4e55cc8253c5a3989" + "sha256:203aff257f8038cd3c67be614fe6b2001043408cb1b4e36576bc4921e09d83c4", + "sha256:f02e5481a4288ec062f8e68c808569e427d905bedfecb7f2e4c69ef77957c382" ], "markers": "python_full_version >= '3.8.0' and python_full_version < '4.0.0'", - "version": "==0.3.2" + "version": "==0.3.3" }, "jsonschema-specifications": { "hashes": [ @@ -2613,11 +2591,11 @@ }, "nodeenv": { "hashes": [ - "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2", - "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec" + "sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f", + "sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", - "version": "==1.8.0" + "version": "==1.9.1" }, "numpy": { "hashes": [ @@ -2681,47 +2659,44 @@ }, "packaging": { "hashes": [ - "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5", - "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9" + "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", + "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" ], "index": "pypi", - "markers": "python_version >= '3.7'", - "version": "==24.0" + "markers": "python_version >= '3.8'", + "version": "==24.1" }, "pandas": { "hashes": [ - "sha256:001910ad31abc7bf06f49dcc903755d2f7f3a9186c0c040b827e522e9cef0863", - "sha256:0ca6377b8fca51815f382bd0b697a0814c8bda55115678cbc94c30aacbb6eff2", - "sha256:0cace394b6ea70c01ca1595f839cf193df35d1575986e484ad35c4aeae7266c1", - "sha256:1cb51fe389360f3b5a4d57dbd2848a5f033350336ca3b340d1c53a1fad33bcad", - "sha256:2925720037f06e89af896c70bca73459d7e6a4be96f9de79e2d440bd499fe0db", - "sha256:3e374f59e440d4ab45ca2fffde54b81ac3834cf5ae2cdfa69c90bc03bde04d76", - "sha256:40ae1dffb3967a52203105a077415a86044a2bea011b5f321c6aa64b379a3f51", - "sha256:43498c0bdb43d55cb162cdc8c06fac328ccb5d2eabe3cadeb3529ae6f0517c32", - "sha256:4abfe0be0d7221be4f12552995e58723c7422c80a659da13ca382697de830c08", - "sha256:58b84b91b0b9f4bafac2a0ac55002280c094dfc6402402332c0913a59654ab2b", - "sha256:640cef9aa381b60e296db324337a554aeeb883ead99dc8f6c18e81a93942f5f4", - "sha256:66b479b0bd07204e37583c191535505410daa8df638fd8e75ae1b383851fe921", - "sha256:696039430f7a562b74fa45f540aca068ea85fa34c244d0deee539cb6d70aa288", - "sha256:6d2123dc9ad6a814bcdea0f099885276b31b24f7edf40f6cdbc0912672e22eee", - "sha256:8635c16bf3d99040fdf3ca3db669a7250ddf49c55dc4aa8fe0ae0fa8d6dcc1f0", - "sha256:873d13d177501a28b2756375d59816c365e42ed8417b41665f346289adc68d24", - "sha256:8e5a0b00e1e56a842f922e7fae8ae4077aee4af0acb5ae3622bd4b4c30aedf99", - "sha256:8e90497254aacacbc4ea6ae5e7a8cd75629d6ad2b30025a4a8b09aa4faf55151", - "sha256:9057e6aa78a584bc93a13f0a9bf7e753a5e9770a30b4d758b8d5f2a62a9433cd", - "sha256:90c6fca2acf139569e74e8781709dccb6fe25940488755716d1d354d6bc58bce", - "sha256:92fd6b027924a7e178ac202cfbe25e53368db90d56872d20ffae94b96c7acc57", - "sha256:9dfde2a0ddef507a631dc9dc4af6a9489d5e2e740e226ad426a05cabfbd7c8ef", - "sha256:9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54", - "sha256:a77e9d1c386196879aa5eb712e77461aaee433e54c68cf253053a73b7e49c33a", - "sha256:c7adfc142dac335d8c1e0dcbd37eb8617eac386596eb9e1a1b77791cf2498238", - "sha256:d187d355ecec3629624fccb01d104da7d7f391db0311145817525281e2804d23", - "sha256:ddf818e4e6c7c6f4f7c8a12709696d193976b591cc7dc50588d3d1a6b5dc8772", - "sha256:e9b79011ff7a0f4b1d6da6a61aa1aa604fb312d6647de5bad20013682d1429ce", - "sha256:eee3a87076c0756de40b05c5e9a6069c035ba43e8dd71c379e68cab2c20f16ad" + "sha256:00028e6737c594feac3c2df15636d73ace46b8314d236100b57ed7e4b9ebe8d9", + "sha256:0aa6e92e639da0d6e2017d9ccff563222f4eb31e4b2c3cf32a2a392fc3103c0d", + "sha256:1ebfd771110b50055712b3b711b51bee5d50135429364d0498e1213a7adc2be8", + "sha256:294d96cfaf28d688f30c918a765ea2ae2e0e71d3536754f4b6de0ea4a496d034", + "sha256:3f06bda01a143020bad20f7a85dd5f4a1600112145f126bc9e3e42077c24ef34", + "sha256:426dc0f1b187523c4db06f96fb5c8d1a845e259c99bda74f7de97bd8a3bb3139", + "sha256:45d63d2a9b1b37fa6c84a68ba2422dc9ed018bdaa668c7f47566a01188ceeec1", + "sha256:482d5076e1791777e1571f2e2d789e940dedd927325cc3cb6d0800c6304082f6", + "sha256:6b728fb8deba8905b319f96447a27033969f3ea1fea09d07d296c9030ab2ed1d", + "sha256:8a706cfe7955c4ca59af8c7a0517370eafbd98593155b48f10f9811da440248b", + "sha256:8ea107e0be2aba1da619cc6ba3f999b2bfc9669a83554b1904ce3dd9507f0860", + "sha256:ab5796839eb1fd62a39eec2916d3e979ec3130509930fea17fe6f81e18108f6a", + "sha256:b0513a132a15977b4a5b89aabd304647919bc2169eac4c8536afb29c07c23540", + "sha256:b7d852d16c270e4331f6f59b3e9aa23f935f5c4b0ed2d0bc77637a8890a5d092", + "sha256:bd7d5f2f54f78164b3d7a40f33bf79a74cdee72c31affec86bfcabe7e0789821", + "sha256:bdec823dc6ec53f7a6339a0e34c68b144a7a1fd28d80c260534c39c62c5bf8c9", + "sha256:d2d3e7b00f703aea3945995ee63375c61b2e6aa5aa7871c5d622870e5e137623", + "sha256:d65148b14788b3758daf57bf42725caa536575da2b64df9964c563b015230984", + "sha256:d797591b6846b9db79e65dc2d0d48e61f7db8d10b2a9480b4e3faaddc421a171", + "sha256:dc9bf7ade01143cddc0074aa6995edd05323974e6e40d9dbde081021ded8510e", + "sha256:e9f17f2b6fc076b2a0078862547595d66244db0f41bf79fc5f64a5c4d635bead", + "sha256:edbaf9e8d3a63a9276d707b4d25930a262341bca9874fcb22eff5e3da5394732", + "sha256:f237e6ca6421265643608813ce9793610ad09b40154a3344a088159590469e46", + "sha256:f69b0c9bb174a2342818d3e2778584e18c740d56857fc5cdb944ec8bbe4082cf", + "sha256:fcb68203c833cc735321512e13861358079a96c174a61f5116a1de89c58c0ef7" ], + "index": "pypi", "markers": "python_version >= '3.9'", - "version": "==2.2.2" + "version": "==2.1.4" }, "pathable": { "hashes": [ @@ -2741,11 +2716,11 @@ }, "platformdirs": { "hashes": [ - "sha256:031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf", - "sha256:17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1" + "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee", + "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3" ], "markers": "python_version >= '3.8'", - "version": "==4.2.1" + "version": "==4.2.2" }, "pluggy": { "hashes": [ @@ -2773,11 +2748,11 @@ }, "pycodestyle": { "hashes": [ - "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f", - "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67" + "sha256:442f950141b4f43df752dd303511ffded3a04c2b6fb7f65980574f0c31e6e79c", + "sha256:949a39f6b86c3e1515ba1787c2022131d165a8ad271b11370a8819aa070269e4" ], "markers": "python_version >= '3.8'", - "version": "==2.11.1" + "version": "==2.12.0" }, "pycparser": { "hashes": [ @@ -2795,6 +2770,38 @@ "markers": "python_version >= '3.8'", "version": "==3.2.0" }, + "pyogrio": { + "hashes": [ + "sha256:019731a856a9abfe909e86f50eb13f8362f6742337caf757c54b7c8acfe75b89", + "sha256:083351b258b3e08b6c6085dac560bd321b68de5cb4a66229095da68d5f3d696b", + "sha256:13642608a1cd67797ae8b5d792b0518d8ef3eb76506c8232ab5eaa1ea1159dff", + "sha256:17420febc17651876d5140b54b24749aa751d482b5f9ef6267b8053e6e962876", + "sha256:1a495ca4fb77c69595747dd688f8f17bb7d2ea9cd86603aa71c7fc98cc8b4174", + "sha256:2829615cf58b1b24a9f96fea42abedaa1a800dd351c67374cc2f6341138608f3", + "sha256:2e98913fa183f7597c609e774820a149e9329fd2a0f8d33978252fbd00ae87e6", + "sha256:2f2ec57ab74785db9c2bf47c0a6731e5175595a13f8253f06fa84136adb310a9", + "sha256:30cbeeaedb9bced7012487e7438919aa0c7dfba18ac3d4315182b46eb3139b9d", + "sha256:3a2fcaa269031dbbc8ebd91243c6452c5d267d6df939c008ab7533413c9cf92d", + "sha256:3f964002d445521ad5b8e732a6b5ef0e2d2be7fe566768e5075c1d71398da64a", + "sha256:4a289584da6df7ca318947301fe0ba9177e7f863f63110e087c80ac5f3658de8", + "sha256:4da0b9deb380bd9a200fee13182c4f95b02b4c554c923e2e0032f32aaf1439ed", + "sha256:4e0f90a6c3771ee1f1fea857778b4b6a1b64000d851b819f435f9091b3c38c60", + "sha256:6a6fa2e8cf95b3d4a7c0fac48bce6e5037579e28d3eb33b53349d6e11f15e5a8", + "sha256:6dc94a67163218581c7df275223488ac9b31dc582ccd756da607c3338908566c", + "sha256:796e4f6a4e769b2eb6fea9a10546ea4bdee16182d1e29802b4d6349363c3c1d7", + "sha256:7fcafed24371fe6e23bcf5abebbb29269f8d79915f1dd818ac85453657ea714a", + "sha256:9440466c0211ac81f3417f274da5903f15546b486f76b2f290e74a56aaf0e737", + "sha256:959022f3ad04053f8072dc9a2ad110c46edd9e4f92352061ba835fc91df3ca96", + "sha256:d668cb10f2bf6ccd7c402f91e8b06290722dd09dbe265ae95b2c13db29ebeba0", + "sha256:e38c3c6d37cf2cc969407e4d051dcb507cfd948eb26c7b0840c4f7d7d4a71bd4", + "sha256:f47c9b6818cc0f420015b672d5dcc488530a5ee63e5ba35a184957b21ea3922a", + "sha256:f5d80eb846be4fc4e642cbedc1ed0c143e8d241653382ecc76a7620bbd2a5c3a", + "sha256:f8bf193269ea9d347ac3ddada960a59f1ab2e4a5c009be95dc70e6505346b2fc", + "sha256:fb04bd80964428491951766452f0071b0bc37c7d38c45ef02502dbd83e5d74a0" + ], + "markers": "python_version >= '3.8'", + "version": "==0.9.0" + }, "pyparsing": { "hashes": [ "sha256:a1bac0ce561155ecc3ed78ca94d3c9378656ad4c94c1270de543f621420f94ad", @@ -2839,12 +2846,12 @@ }, "pytest": { "hashes": [ - "sha256:1733f0620f6cda4095bbf0d9ff8022486e91892245bb9e7d5542c018f612f233", - "sha256:d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f" + "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343", + "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977" ], "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==8.2.0" + "version": "==8.2.2" }, "pytest-asyncio": { "hashes": [ @@ -2975,28 +2982,28 @@ }, "referencing": { "hashes": [ - "sha256:81a1471c68c9d5e3831c30ad1dd9815c45b558e596653db751a2bfdd17b3b9ec", - "sha256:c19c4d006f1757e3dd75c4f784d38f8698d87b649c54f9ace14e5e8c9667c01d" + "sha256:25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c", + "sha256:eda6d3234d62814d1c64e305c1331c9a3a6132da475ab6382eaa997b21ee75de" ], "markers": "python_version >= '3.8'", - "version": "==0.31.1" + "version": "==0.35.1" }, "requests": { "hashes": [ - "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f", - "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" + "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760", + "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6" ], - "markers": "python_version >= '3.7'", - "version": "==2.31.0" + "markers": "python_version >= '3.8'", + "version": "==2.32.3" }, "responses": { "hashes": [ - "sha256:5955ad3468fe8eb5fb736cdab4943457b7768f8670fa3624b4e26ff52dfe20c0", - "sha256:866757987d1962aa908d9c8b3185739faefd72a359e95459de0c2e4e5369c9b2" + "sha256:521efcbc82081ab8daa588e08f7e8a64ce79b91c39f6e62199b19159bea7dbcb", + "sha256:617b9247abd9ae28313d57a75880422d55ec63c29d33d629697590a034358dba" ], "index": "pypi", - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==0.15.0" + "markers": "python_version >= '3.8'", + "version": "==0.25.3" }, "retrying": { "hashes": [ @@ -3121,19 +3128,19 @@ }, "s3transfer": { "hashes": [ - "sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19", - "sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d" + "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6", + "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69" ], "markers": "python_version >= '3.8'", - "version": "==0.10.1" + "version": "==0.10.2" }, "setuptools": { "hashes": [ - "sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987", - "sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32" + "sha256:937a48c7cdb7a21eb53cd7f9b59e525503aa8abaf3584c730dc5f7a5bec3a650", + "sha256:a58a8fde0541dab0419750bcc521fbdf8585f6e5cb41909df3a472ef7b81ca95" ], "markers": "python_version >= '3.8'", - "version": "==69.5.1" + "version": "==70.1.1" }, "shapely": { "hashes": [ @@ -3215,11 +3222,11 @@ }, "typing-extensions": { "hashes": [ - "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0", - "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a" + "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", + "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8" ], "markers": "python_version >= '3.8'", - "version": "==4.11.0" + "version": "==4.12.2" }, "tzdata": { "hashes": [ @@ -3231,19 +3238,19 @@ }, "urllib3": { "hashes": [ - "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d", - "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19" + "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472", + "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "markers": "python_version >= '3.10'", - "version": "==2.2.1" + "version": "==2.2.2" }, "virtualenv": { "hashes": [ - "sha256:604bfdceaeece392802e6ae48e69cec49168b9c5f4a44e483963f9242eb0e78b", - "sha256:7aa9982a728ae5892558bff6a2839c00b9ed145523ece2274fad6f414690ae75" + "sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a", + "sha256:8cc4a31139e796e9a7de2cd5cf2489de1217193116a8fd42328f1bd65f434589" ], "markers": "python_version >= '3.7'", - "version": "==20.26.1" + "version": "==20.26.3" }, "werkzeug": { "hashes": [ From 5890c6416f47c85179a75657889185ca7f662ca0 Mon Sep 17 00:00:00 2001 From: Daniel Mannarino Date: Thu, 27 Jun 2024 10:54:38 -0400 Subject: [PATCH 14/14] Settle on final dockerfile versions --- batch/gdal-python.dockerfile | 2 +- batch/pixetl.dockerfile | 2 +- batch/postgresql-client.dockerfile | 2 +- batch/tile_cache.dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/batch/gdal-python.dockerfile b/batch/gdal-python.dockerfile index bae765ffc..7f8362166 100644 --- a/batch/gdal-python.dockerfile +++ b/batch/gdal-python.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-gdal:v1.2.0b +FROM globalforestwatch/data-api-gdal:v1.2.0 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ diff --git a/batch/pixetl.dockerfile b/batch/pixetl.dockerfile index a774b7a18..6c7f44fc3 100644 --- a/batch/pixetl.dockerfile +++ b/batch/pixetl.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/pixetl:v1.7.7b +FROM globalforestwatch/pixetl:v1.7.7 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ diff --git a/batch/postgresql-client.dockerfile b/batch/postgresql-client.dockerfile index 7ab81f563..b0ad97f6a 100644 --- a/batch/postgresql-client.dockerfile +++ b/batch/postgresql-client.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-postgresql:v1.1.0b +FROM globalforestwatch/data-api-postgresql:v1.1.0 # Copy scripts COPY ./batch/scripts/ /opt/scripts/ diff --git a/batch/tile_cache.dockerfile b/batch/tile_cache.dockerfile index e96dd5dd3..3ab80ba30 100644 --- a/batch/tile_cache.dockerfile +++ b/batch/tile_cache.dockerfile @@ -1,4 +1,4 @@ -FROM globalforestwatch/data-api-tippecanoe:v1.3.1a +FROM globalforestwatch/data-api-tippecanoe:v1.3.1 # Copy scripts COPY ./batch/scripts/ /opt/scripts/