From 883e208895a05cb1c124d5c4b947171fa63157da Mon Sep 17 00:00:00 2001 From: Soren Spicknall Date: Mon, 12 Feb 2024 10:25:03 -0600 Subject: [PATCH 1/6] Bump references to calitp-data-infra across the board --- airflow/requirements.txt | 2 +- jobs/gtfs-aggregator-scraper/pyproject.toml | 2 +- jobs/gtfs-rt-parser-v2/pyproject.toml | 2 +- jobs/gtfs-schedule-validator/pyproject.toml | 2 +- script/pyproject.toml | 2 +- services/gtfs-rt-archiver-v3/pyproject.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/airflow/requirements.txt b/airflow/requirements.txt index bfe313a695..067decb15c 100644 --- a/airflow/requirements.txt +++ b/airflow/requirements.txt @@ -1,4 +1,4 @@ -calitp-data-infra==2024.1.3 +calitp-data-infra==2024.2.12 gusty==0.6.0 pyairtable==2.2.1 pydantic==1.9 diff --git a/jobs/gtfs-aggregator-scraper/pyproject.toml b/jobs/gtfs-aggregator-scraper/pyproject.toml index 862f903d1a..731daa23f7 100644 --- a/jobs/gtfs-aggregator-scraper/pyproject.toml +++ b/jobs/gtfs-aggregator-scraper/pyproject.toml @@ -7,7 +7,7 @@ authors = ["Andrew Vaccaro "] [tool.poetry.dependencies] python = "~3.9" typer = "^0.7.0" -calitp-data-infra = "2024.1.3" +calitp-data-infra = "2024.2.12" [tool.poetry.dev-dependencies] pytest = "^7.2.0" diff --git a/jobs/gtfs-rt-parser-v2/pyproject.toml b/jobs/gtfs-rt-parser-v2/pyproject.toml index 14e92f9a6d..7b8acb520a 100644 --- a/jobs/gtfs-rt-parser-v2/pyproject.toml +++ b/jobs/gtfs-rt-parser-v2/pyproject.toml @@ -16,7 +16,7 @@ typer = "^0.6.1" protobuf = "^3.20.2" backoff = "^2.2.1" sentry-sdk = "^1.12.1" -calitp-data-infra = "2024.1.3" +calitp-data-infra = "2024.2.12" [tool.poetry.dev-dependencies] pytest = "^7.1.2" diff --git a/jobs/gtfs-schedule-validator/pyproject.toml b/jobs/gtfs-schedule-validator/pyproject.toml index 5897ef8068..99117b95de 100644 --- a/jobs/gtfs-schedule-validator/pyproject.toml +++ b/jobs/gtfs-schedule-validator/pyproject.toml @@ -16,7 +16,7 @@ tqdm = "^4.64.0" backoff = "^2.2.1" python-slugify = "^7.0.0" sentry-sdk = "^1.12.1" -calitp-data-infra = "2024.1.3" +calitp-data-infra = "2024.2.12" [tool.poetry.dev-dependencies] pytest = "^5.2" diff --git a/script/pyproject.toml b/script/pyproject.toml index 80f772a70f..35842dd111 100644 --- a/script/pyproject.toml +++ b/script/pyproject.toml @@ -12,7 +12,7 @@ requests = "^2.28.2" jsonschema = "^4.17.3" typer = "^0.7.0" openpyxl = "^3.1.0" -calitp-data-infra = "2024.1.3" +calitp-data-infra = "2024.2.12" [tool.poetry.dev-dependencies] mypy = "^1.0.0" diff --git a/services/gtfs-rt-archiver-v3/pyproject.toml b/services/gtfs-rt-archiver-v3/pyproject.toml index 0bec3487cf..2e2ce6dcb5 100644 --- a/services/gtfs-rt-archiver-v3/pyproject.toml +++ b/services/gtfs-rt-archiver-v3/pyproject.toml @@ -22,7 +22,7 @@ structlog = "^22.1.0" python-json-logger = "^2.0.4" backoff = "^2.1.2" sentry-sdk = "^1.9.8" -calitp-data-infra = "2024.1.3" +calitp-data-infra = "2024.2.12" [tool.poetry.dev-dependencies] pytest = "^5.2" From 7a8e15b12759e06858d9b9678a0a31a0ef100c77 Mon Sep 17 00:00:00 2001 From: Soren Spicknall Date: Mon, 12 Feb 2024 10:29:09 -0600 Subject: [PATCH 2/6] Add lockfile changes --- jobs/gtfs-aggregator-scraper/poetry.lock | 45 ++++++++++++++------ jobs/gtfs-rt-parser-v2/poetry.lock | 53 ++++++++++++++++-------- jobs/gtfs-schedule-validator/poetry.lock | 45 ++++++++++++++------ script/poetry.lock | 45 ++++++++++++++------ services/gtfs-rt-archiver-v3/poetry.lock | 45 ++++++++++++++------ 5 files changed, 164 insertions(+), 69 deletions(-) diff --git a/jobs/gtfs-aggregator-scraper/poetry.lock b/jobs/gtfs-aggregator-scraper/poetry.lock index 1e5420482b..fe0521dea5 100644 --- a/jobs/gtfs-aggregator-scraper/poetry.lock +++ b/jobs/gtfs-aggregator-scraper/poetry.lock @@ -205,21 +205,21 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.1.3" +version = "2024.2.12" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.1.3-py3-none-any.whl", hash = "sha256:7e4afd38290038249d4f4ecb2ae76f6118eab4e424da10410f9c2495a7510437"}, - {file = "calitp_data_infra-2024.1.3.tar.gz", hash = "sha256:cf6743107c9b3f4e19dc008aa4c65b97625cb629d878a5c3c6e5ec1409b10d53"}, + {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, + {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, ] [package.dependencies] backoff = ">=2.2.1,<3.0.0" gcsfs = "!=2022.7.1" google-api-core = ">=1.31.4" -google-cloud-secret-manager = ">=1.0.0,<1.1.0" +google-cloud-secret-manager = "2.16.4" humanize = ">=4.6.0,<5.0.0" pendulum = ">=2.1.2,<3.0.0" pydantic = ">=1.9,<1.10" @@ -613,20 +613,21 @@ grpc = ["grpcio (>=1.38.0,<2.0dev)"] [[package]] name = "google-cloud-secret-manager" -version = "1.0.2" -description = "Secret Manager API API client library" +version = "2.16.4" +description = "Google Cloud Secret Manager API client library" category = "main" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +python-versions = ">=3.7" files = [ - {file = "google-cloud-secret-manager-1.0.2.tar.gz", hash = "sha256:dfe561c11904adc5692bde12c6da5e82b07f096e7863baf795381042689588e6"}, - {file = "google_cloud_secret_manager-1.0.2-py2.py3-none-any.whl", hash = "sha256:d3041bee17c6765194672147e57538a72f7e9637d5f8bb04450972ddce5fa512"}, + {file = "google-cloud-secret-manager-2.16.4.tar.gz", hash = "sha256:371dc72f9145af323e8a813c8e50380e6ac4bd6a5dbcd42dcf3162d8f37e5080"}, + {file = "google_cloud_secret_manager-2.16.4-py2.py3-none-any.whl", hash = "sha256:5031c45dd84dc584d91ee0baae2bbd5df6710efe0c42719ee370a3ab62aaf618"}, ] [package.dependencies] -google-api-core = {version = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0dev", extras = ["grpc"]} -grpc-google-iam-v1 = ">=0.12.3,<0.13dev" -protobuf = "<4.0.0dev" +google-api-core = {version = ">=1.34.0,<2.0.0 || >=2.11.0,<3.0.0dev", extras = ["grpc"]} +grpc-google-iam-v1 = ">=0.12.4,<1.0.0dev" +proto-plus = ">=1.22.0,<2.0.0dev" +protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" [[package]] name = "google-cloud-storage" @@ -1155,6 +1156,24 @@ files = [ dev = ["pre-commit", "tox"] testing = ["pytest", "pytest-benchmark"] +[[package]] +name = "proto-plus" +version = "1.23.0" +description = "Beautiful, Pythonic protocol buffers." +category = "main" +optional = false +python-versions = ">=3.6" +files = [ + {file = "proto-plus-1.23.0.tar.gz", hash = "sha256:89075171ef11988b3fa157f5dbd8b9cf09d65fffee97e29ce403cd8defba19d2"}, + {file = "proto_plus-1.23.0-py3-none-any.whl", hash = "sha256:a829c79e619e1cf632de091013a4173deed13a55f326ef84f05af6f50ff4c82c"}, +] + +[package.dependencies] +protobuf = ">=3.19.0,<5.0.0dev" + +[package.extras] +testing = ["google-api-core[grpc] (>=1.31.5)"] + [[package]] name = "protobuf" version = "3.20.3" @@ -1597,4 +1616,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "~3.9" -content-hash = "c62127cffd99b9ae47c97496fd248a76a47b4f600b419c7a500fa8def2a599df" +content-hash = "07720c6d3235c17e2ef50c040178ed609610fc9c803148cee0add464784eac19" diff --git a/jobs/gtfs-rt-parser-v2/poetry.lock b/jobs/gtfs-rt-parser-v2/poetry.lock index 363d01bba7..6aa2129305 100644 --- a/jobs/gtfs-rt-parser-v2/poetry.lock +++ b/jobs/gtfs-rt-parser-v2/poetry.lock @@ -205,21 +205,21 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.1.3" +version = "2024.2.12" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.1.3-py3-none-any.whl", hash = "sha256:7e4afd38290038249d4f4ecb2ae76f6118eab4e424da10410f9c2495a7510437"}, - {file = "calitp_data_infra-2024.1.3.tar.gz", hash = "sha256:cf6743107c9b3f4e19dc008aa4c65b97625cb629d878a5c3c6e5ec1409b10d53"}, + {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, + {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, ] [package.dependencies] backoff = ">=2.2.1,<3.0.0" gcsfs = "!=2022.7.1" google-api-core = ">=1.31.4" -google-cloud-secret-manager = ">=1.0.0,<1.1.0" +google-cloud-secret-manager = "2.16.4" humanize = ">=4.6.0,<5.0.0" pendulum = ">=2.1.2,<3.0.0" pydantic = ">=1.9,<1.10" @@ -624,14 +624,14 @@ gcsfuse = ["fusepy"] [[package]] name = "google-api-core" -version = "2.10.2" +version = "1.34.0" description = "Google API client core library" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "google-api-core-2.10.2.tar.gz", hash = "sha256:10c06f7739fe57781f87523375e8e1a3a4674bf6392cd6131a3222182b971320"}, - {file = "google_api_core-2.10.2-py3-none-any.whl", hash = "sha256:34f24bd1d5f72a8c4519773d99ca6bf080a6c4e041b4e9f024fe230191dda62e"}, + {file = "google-api-core-1.34.0.tar.gz", hash = "sha256:6fb380f49d19ee1d09a9722d0379042b7edb06c0112e4796c7a395078a043e71"}, + {file = "google_api_core-1.34.0-py3-none-any.whl", hash = "sha256:7421474c39d396a74dfa317dddbc69188f2336835f526087c7648f91105e32ff"}, ] [package.dependencies] @@ -639,7 +639,7 @@ google-auth = ">=1.25.0,<3.0dev" googleapis-common-protos = ">=1.56.2,<2.0dev" grpcio = {version = ">=1.33.2,<2.0dev", optional = true, markers = "extra == \"grpc\""} grpcio-status = {version = ">=1.33.2,<2.0dev", optional = true, markers = "extra == \"grpc\""} -protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" +protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.0.0dev" requests = ">=2.18.0,<3.0.0dev" [package.extras] @@ -711,20 +711,21 @@ grpc = ["grpcio (>=1.38.0,<2.0dev)"] [[package]] name = "google-cloud-secret-manager" -version = "1.0.2" -description = "Secret Manager API API client library" +version = "2.16.4" +description = "Google Cloud Secret Manager API client library" category = "main" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +python-versions = ">=3.7" files = [ - {file = "google-cloud-secret-manager-1.0.2.tar.gz", hash = "sha256:dfe561c11904adc5692bde12c6da5e82b07f096e7863baf795381042689588e6"}, - {file = "google_cloud_secret_manager-1.0.2-py2.py3-none-any.whl", hash = "sha256:d3041bee17c6765194672147e57538a72f7e9637d5f8bb04450972ddce5fa512"}, + {file = "google-cloud-secret-manager-2.16.4.tar.gz", hash = "sha256:371dc72f9145af323e8a813c8e50380e6ac4bd6a5dbcd42dcf3162d8f37e5080"}, + {file = "google_cloud_secret_manager-2.16.4-py2.py3-none-any.whl", hash = "sha256:5031c45dd84dc584d91ee0baae2bbd5df6710efe0c42719ee370a3ab62aaf618"}, ] [package.dependencies] -google-api-core = {version = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0dev", extras = ["grpc"]} -grpc-google-iam-v1 = ">=0.12.3,<0.13dev" -protobuf = "<4.0.0dev" +google-api-core = {version = ">=1.34.0,<2.0.0 || >=2.11.0,<3.0.0dev", extras = ["grpc"]} +grpc-google-iam-v1 = ">=0.12.4,<1.0.0dev" +proto-plus = ">=1.22.0,<2.0.0dev" +protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" [[package]] name = "google-cloud-storage" @@ -1580,6 +1581,24 @@ files = [ dev = ["pre-commit", "tox"] testing = ["pytest", "pytest-benchmark"] +[[package]] +name = "proto-plus" +version = "1.23.0" +description = "Beautiful, Pythonic protocol buffers." +category = "main" +optional = false +python-versions = ">=3.6" +files = [ + {file = "proto-plus-1.23.0.tar.gz", hash = "sha256:89075171ef11988b3fa157f5dbd8b9cf09d65fffee97e29ce403cd8defba19d2"}, + {file = "proto_plus-1.23.0-py3-none-any.whl", hash = "sha256:a829c79e619e1cf632de091013a4173deed13a55f326ef84f05af6f50ff4c82c"}, +] + +[package.dependencies] +protobuf = ">=3.19.0,<5.0.0dev" + +[package.extras] +testing = ["google-api-core[grpc] (>=1.31.5)"] + [[package]] name = "protobuf" version = "3.20.3" @@ -2203,4 +2222,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.10" -content-hash = "eac27152392e1c15b37bd95f620c3c1073045933ed1fef1de496432fc2eb13b1" +content-hash = "3fc60713e876bf0de25a42ffb2c207e51e6e6351012c89998215278d2c854310" diff --git a/jobs/gtfs-schedule-validator/poetry.lock b/jobs/gtfs-schedule-validator/poetry.lock index e70f483446..86dc06ea1e 100644 --- a/jobs/gtfs-schedule-validator/poetry.lock +++ b/jobs/gtfs-schedule-validator/poetry.lock @@ -180,21 +180,21 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.1.3" +version = "2024.2.12" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.1.3-py3-none-any.whl", hash = "sha256:7e4afd38290038249d4f4ecb2ae76f6118eab4e424da10410f9c2495a7510437"}, - {file = "calitp_data_infra-2024.1.3.tar.gz", hash = "sha256:cf6743107c9b3f4e19dc008aa4c65b97625cb629d878a5c3c6e5ec1409b10d53"}, + {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, + {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, ] [package.dependencies] backoff = ">=2.2.1,<3.0.0" gcsfs = "!=2022.7.1" google-api-core = ">=1.31.4" -google-cloud-secret-manager = ">=1.0.0,<1.1.0" +google-cloud-secret-manager = "2.16.4" humanize = ">=4.6.0,<5.0.0" pendulum = ">=2.1.2,<3.0.0" pydantic = ">=1.9,<1.10" @@ -572,20 +572,21 @@ grpc = ["grpcio (>=1.38.0,<2.0dev)"] [[package]] name = "google-cloud-secret-manager" -version = "1.0.2" -description = "Secret Manager API API client library" +version = "2.16.4" +description = "Google Cloud Secret Manager API client library" category = "main" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +python-versions = ">=3.7" files = [ - {file = "google-cloud-secret-manager-1.0.2.tar.gz", hash = "sha256:dfe561c11904adc5692bde12c6da5e82b07f096e7863baf795381042689588e6"}, - {file = "google_cloud_secret_manager-1.0.2-py2.py3-none-any.whl", hash = "sha256:d3041bee17c6765194672147e57538a72f7e9637d5f8bb04450972ddce5fa512"}, + {file = "google-cloud-secret-manager-2.16.4.tar.gz", hash = "sha256:371dc72f9145af323e8a813c8e50380e6ac4bd6a5dbcd42dcf3162d8f37e5080"}, + {file = "google_cloud_secret_manager-2.16.4-py2.py3-none-any.whl", hash = "sha256:5031c45dd84dc584d91ee0baae2bbd5df6710efe0c42719ee370a3ab62aaf618"}, ] [package.dependencies] -google-api-core = {version = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0dev", extras = ["grpc"]} -grpc-google-iam-v1 = ">=0.12.3,<0.13dev" -protobuf = "<4.0.0dev" +google-api-core = {version = ">=1.34.0,<2.0.0 || >=2.11.0,<3.0.0dev", extras = ["grpc"]} +grpc-google-iam-v1 = ">=0.12.4,<1.0.0dev" +proto-plus = ">=1.22.0,<2.0.0dev" +protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" [[package]] name = "google-cloud-storage" @@ -1085,6 +1086,24 @@ files = [ [package.extras] dev = ["pre-commit", "tox"] +[[package]] +name = "proto-plus" +version = "1.23.0" +description = "Beautiful, Pythonic protocol buffers." +category = "main" +optional = false +python-versions = ">=3.6" +files = [ + {file = "proto-plus-1.23.0.tar.gz", hash = "sha256:89075171ef11988b3fa157f5dbd8b9cf09d65fffee97e29ce403cd8defba19d2"}, + {file = "proto_plus-1.23.0-py3-none-any.whl", hash = "sha256:a829c79e619e1cf632de091013a4173deed13a55f326ef84f05af6f50ff4c82c"}, +] + +[package.dependencies] +protobuf = ">=3.19.0,<5.0.0dev" + +[package.extras] +testing = ["google-api-core[grpc] (>=1.31.5)"] + [[package]] name = "protobuf" version = "3.20.3" @@ -1636,4 +1655,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.10" -content-hash = "67331660b11d3e105d664174d62f49242f8ab274f834d7cca8ca539f8745aa51" +content-hash = "ca00f578895384f5c0160604520c3ea83214a4a84cc9e7c685d703fac766c38d" diff --git a/script/poetry.lock b/script/poetry.lock index c2ab9f3176..b6be77ef93 100644 --- a/script/poetry.lock +++ b/script/poetry.lock @@ -169,21 +169,21 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.1.3" +version = "2024.2.12" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.1.3-py3-none-any.whl", hash = "sha256:7e4afd38290038249d4f4ecb2ae76f6118eab4e424da10410f9c2495a7510437"}, - {file = "calitp_data_infra-2024.1.3.tar.gz", hash = "sha256:cf6743107c9b3f4e19dc008aa4c65b97625cb629d878a5c3c6e5ec1409b10d53"}, + {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, + {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, ] [package.dependencies] backoff = ">=2.2.1,<3.0.0" gcsfs = "!=2022.7.1" google-api-core = ">=1.31.4" -google-cloud-secret-manager = ">=1.0.0,<1.1.0" +google-cloud-secret-manager = "2.16.4" humanize = ">=4.6.0,<5.0.0" pendulum = ">=2.1.2,<3.0.0" pydantic = ">=1.9,<1.10" @@ -561,20 +561,21 @@ grpc = ["grpcio (>=1.38.0,<2.0dev)"] [[package]] name = "google-cloud-secret-manager" -version = "1.0.2" -description = "Secret Manager API API client library" +version = "2.16.4" +description = "Google Cloud Secret Manager API client library" category = "main" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +python-versions = ">=3.7" files = [ - {file = "google-cloud-secret-manager-1.0.2.tar.gz", hash = "sha256:dfe561c11904adc5692bde12c6da5e82b07f096e7863baf795381042689588e6"}, - {file = "google_cloud_secret_manager-1.0.2-py2.py3-none-any.whl", hash = "sha256:d3041bee17c6765194672147e57538a72f7e9637d5f8bb04450972ddce5fa512"}, + {file = "google-cloud-secret-manager-2.16.4.tar.gz", hash = "sha256:371dc72f9145af323e8a813c8e50380e6ac4bd6a5dbcd42dcf3162d8f37e5080"}, + {file = "google_cloud_secret_manager-2.16.4-py2.py3-none-any.whl", hash = "sha256:5031c45dd84dc584d91ee0baae2bbd5df6710efe0c42719ee370a3ab62aaf618"}, ] [package.dependencies] -google-api-core = {version = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0dev", extras = ["grpc"]} -grpc-google-iam-v1 = ">=0.12.3,<0.13dev" -protobuf = "<4.0.0dev" +google-api-core = {version = ">=1.34.0,<2.0.0 || >=2.11.0,<3.0.0dev", extras = ["grpc"]} +grpc-google-iam-v1 = ">=0.12.4,<1.0.0dev" +proto-plus = ">=1.22.0,<2.0.0dev" +protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" [[package]] name = "google-cloud-storage" @@ -1126,6 +1127,24 @@ files = [ python-dateutil = ">=2.6,<3.0" pytzdata = ">=2020.1" +[[package]] +name = "proto-plus" +version = "1.23.0" +description = "Beautiful, Pythonic protocol buffers." +category = "main" +optional = false +python-versions = ">=3.6" +files = [ + {file = "proto-plus-1.23.0.tar.gz", hash = "sha256:89075171ef11988b3fa157f5dbd8b9cf09d65fffee97e29ce403cd8defba19d2"}, + {file = "proto_plus-1.23.0-py3-none-any.whl", hash = "sha256:a829c79e619e1cf632de091013a4173deed13a55f326ef84f05af6f50ff4c82c"}, +] + +[package.dependencies] +protobuf = ">=3.19.0,<5.0.0dev" + +[package.extras] +testing = ["google-api-core[grpc] (>=1.31.5)"] + [[package]] name = "protobuf" version = "3.20.3" @@ -1620,4 +1639,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "~3.9" -content-hash = "d2e62e3a91bf5b9154101b1742277e55d767b887cd559ecaea4c521700b5714b" +content-hash = "e2d4e3b7e44f58ca54a6b4532cd64654908e0eb2f1648852c1b4b38543bdd0bf" diff --git a/services/gtfs-rt-archiver-v3/poetry.lock b/services/gtfs-rt-archiver-v3/poetry.lock index 39f5e98bb1..7551c51cde 100644 --- a/services/gtfs-rt-archiver-v3/poetry.lock +++ b/services/gtfs-rt-archiver-v3/poetry.lock @@ -216,21 +216,21 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.1.3" +version = "2024.2.12" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.1.3-py3-none-any.whl", hash = "sha256:7e4afd38290038249d4f4ecb2ae76f6118eab4e424da10410f9c2495a7510437"}, - {file = "calitp_data_infra-2024.1.3.tar.gz", hash = "sha256:cf6743107c9b3f4e19dc008aa4c65b97625cb629d878a5c3c6e5ec1409b10d53"}, + {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, + {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, ] [package.dependencies] backoff = ">=2.2.1,<3.0.0" gcsfs = "!=2022.7.1" google-api-core = ">=1.31.4" -google-cloud-secret-manager = ">=1.0.0,<1.1.0" +google-cloud-secret-manager = "2.16.4" humanize = ">=4.6.0,<5.0.0" pendulum = ">=2.1.2,<3.0.0" pydantic = ">=1.9,<1.10" @@ -596,20 +596,21 @@ grpc = ["grpcio (>=1.38.0,<2.0dev)"] [[package]] name = "google-cloud-secret-manager" -version = "1.0.2" -description = "Secret Manager API API client library" +version = "2.16.4" +description = "Google Cloud Secret Manager API client library" category = "main" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +python-versions = ">=3.7" files = [ - {file = "google-cloud-secret-manager-1.0.2.tar.gz", hash = "sha256:dfe561c11904adc5692bde12c6da5e82b07f096e7863baf795381042689588e6"}, - {file = "google_cloud_secret_manager-1.0.2-py2.py3-none-any.whl", hash = "sha256:d3041bee17c6765194672147e57538a72f7e9637d5f8bb04450972ddce5fa512"}, + {file = "google-cloud-secret-manager-2.16.4.tar.gz", hash = "sha256:371dc72f9145af323e8a813c8e50380e6ac4bd6a5dbcd42dcf3162d8f37e5080"}, + {file = "google_cloud_secret_manager-2.16.4-py2.py3-none-any.whl", hash = "sha256:5031c45dd84dc584d91ee0baae2bbd5df6710efe0c42719ee370a3ab62aaf618"}, ] [package.dependencies] -google-api-core = {version = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0dev", extras = ["grpc"]} -grpc-google-iam-v1 = ">=0.12.3,<0.13dev" -protobuf = "<4.0.0dev" +google-api-core = {version = ">=1.34.0,<2.0.0 || >=2.11.0,<3.0.0dev", extras = ["grpc"]} +grpc-google-iam-v1 = ">=0.12.4,<1.0.0dev" +proto-plus = ">=1.22.0,<2.0.0dev" +protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" [[package]] name = "google-cloud-storage" @@ -1318,6 +1319,24 @@ files = [ [package.extras] twisted = ["twisted"] +[[package]] +name = "proto-plus" +version = "1.23.0" +description = "Beautiful, Pythonic protocol buffers." +category = "main" +optional = false +python-versions = ">=3.6" +files = [ + {file = "proto-plus-1.23.0.tar.gz", hash = "sha256:89075171ef11988b3fa157f5dbd8b9cf09d65fffee97e29ce403cd8defba19d2"}, + {file = "proto_plus-1.23.0-py3-none-any.whl", hash = "sha256:a829c79e619e1cf632de091013a4173deed13a55f326ef84f05af6f50ff4c82c"}, +] + +[package.dependencies] +protobuf = ">=3.19.0,<5.0.0dev" + +[package.extras] +testing = ["google-api-core[grpc] (>=1.31.5)"] + [[package]] name = "protobuf" version = "3.20.3" @@ -1927,4 +1946,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "~3.9" -content-hash = "ef442a3e7b29351d0923a8c3d710e3bb3ea4e18f858b107e6a80f73298807f26" +content-hash = "c093d08cb2aae88a90589fea13f41aff3a99eea906efbaa072816b1951b510b7" From c04a2e443e267bce81b9d5d90a64bf5c30dc407c Mon Sep 17 00:00:00 2001 From: Soren Spicknall Date: Mon, 12 Feb 2024 10:47:30 -0600 Subject: [PATCH 3/6] Undo change in archiver --- services/gtfs-rt-archiver-v3/poetry.lock | 45 ++++++--------------- services/gtfs-rt-archiver-v3/pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 33 deletions(-) diff --git a/services/gtfs-rt-archiver-v3/poetry.lock b/services/gtfs-rt-archiver-v3/poetry.lock index 7551c51cde..39f5e98bb1 100644 --- a/services/gtfs-rt-archiver-v3/poetry.lock +++ b/services/gtfs-rt-archiver-v3/poetry.lock @@ -216,21 +216,21 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.2.12" +version = "2024.1.3" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, - {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, + {file = "calitp_data_infra-2024.1.3-py3-none-any.whl", hash = "sha256:7e4afd38290038249d4f4ecb2ae76f6118eab4e424da10410f9c2495a7510437"}, + {file = "calitp_data_infra-2024.1.3.tar.gz", hash = "sha256:cf6743107c9b3f4e19dc008aa4c65b97625cb629d878a5c3c6e5ec1409b10d53"}, ] [package.dependencies] backoff = ">=2.2.1,<3.0.0" gcsfs = "!=2022.7.1" google-api-core = ">=1.31.4" -google-cloud-secret-manager = "2.16.4" +google-cloud-secret-manager = ">=1.0.0,<1.1.0" humanize = ">=4.6.0,<5.0.0" pendulum = ">=2.1.2,<3.0.0" pydantic = ">=1.9,<1.10" @@ -596,21 +596,20 @@ grpc = ["grpcio (>=1.38.0,<2.0dev)"] [[package]] name = "google-cloud-secret-manager" -version = "2.16.4" -description = "Google Cloud Secret Manager API client library" +version = "1.0.2" +description = "Secret Manager API API client library" category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" files = [ - {file = "google-cloud-secret-manager-2.16.4.tar.gz", hash = "sha256:371dc72f9145af323e8a813c8e50380e6ac4bd6a5dbcd42dcf3162d8f37e5080"}, - {file = "google_cloud_secret_manager-2.16.4-py2.py3-none-any.whl", hash = "sha256:5031c45dd84dc584d91ee0baae2bbd5df6710efe0c42719ee370a3ab62aaf618"}, + {file = "google-cloud-secret-manager-1.0.2.tar.gz", hash = "sha256:dfe561c11904adc5692bde12c6da5e82b07f096e7863baf795381042689588e6"}, + {file = "google_cloud_secret_manager-1.0.2-py2.py3-none-any.whl", hash = "sha256:d3041bee17c6765194672147e57538a72f7e9637d5f8bb04450972ddce5fa512"}, ] [package.dependencies] -google-api-core = {version = ">=1.34.0,<2.0.0 || >=2.11.0,<3.0.0dev", extras = ["grpc"]} -grpc-google-iam-v1 = ">=0.12.4,<1.0.0dev" -proto-plus = ">=1.22.0,<2.0.0dev" -protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" +google-api-core = {version = ">=1.31.5,<2.0.0 || >2.3.0,<3.0.0dev", extras = ["grpc"]} +grpc-google-iam-v1 = ">=0.12.3,<0.13dev" +protobuf = "<4.0.0dev" [[package]] name = "google-cloud-storage" @@ -1319,24 +1318,6 @@ files = [ [package.extras] twisted = ["twisted"] -[[package]] -name = "proto-plus" -version = "1.23.0" -description = "Beautiful, Pythonic protocol buffers." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "proto-plus-1.23.0.tar.gz", hash = "sha256:89075171ef11988b3fa157f5dbd8b9cf09d65fffee97e29ce403cd8defba19d2"}, - {file = "proto_plus-1.23.0-py3-none-any.whl", hash = "sha256:a829c79e619e1cf632de091013a4173deed13a55f326ef84f05af6f50ff4c82c"}, -] - -[package.dependencies] -protobuf = ">=3.19.0,<5.0.0dev" - -[package.extras] -testing = ["google-api-core[grpc] (>=1.31.5)"] - [[package]] name = "protobuf" version = "3.20.3" @@ -1946,4 +1927,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "~3.9" -content-hash = "c093d08cb2aae88a90589fea13f41aff3a99eea906efbaa072816b1951b510b7" +content-hash = "ef442a3e7b29351d0923a8c3d710e3bb3ea4e18f858b107e6a80f73298807f26" diff --git a/services/gtfs-rt-archiver-v3/pyproject.toml b/services/gtfs-rt-archiver-v3/pyproject.toml index 2e2ce6dcb5..0bec3487cf 100644 --- a/services/gtfs-rt-archiver-v3/pyproject.toml +++ b/services/gtfs-rt-archiver-v3/pyproject.toml @@ -22,7 +22,7 @@ structlog = "^22.1.0" python-json-logger = "^2.0.4" backoff = "^2.1.2" sentry-sdk = "^1.9.8" -calitp-data-infra = "2024.2.12" +calitp-data-infra = "2024.1.3" [tool.poetry.dev-dependencies] pytest = "^5.2" From 144fda1e00d54f7d1a3a57189b871223a32c8819 Mon Sep 17 00:00:00 2001 From: Soren Spicknall Date: Mon, 12 Feb 2024 11:24:11 -0600 Subject: [PATCH 4/6] Update to post1 ref --- airflow/requirements.txt | 2 +- jobs/gtfs-aggregator-scraper/poetry.lock | 8 ++++---- jobs/gtfs-aggregator-scraper/pyproject.toml | 2 +- jobs/gtfs-rt-parser-v2/poetry.lock | 8 ++++---- jobs/gtfs-rt-parser-v2/pyproject.toml | 2 +- jobs/gtfs-schedule-validator/poetry.lock | 8 ++++---- jobs/gtfs-schedule-validator/pyproject.toml | 2 +- script/poetry.lock | 8 ++++---- script/pyproject.toml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/airflow/requirements.txt b/airflow/requirements.txt index 067decb15c..cb975db87a 100644 --- a/airflow/requirements.txt +++ b/airflow/requirements.txt @@ -1,4 +1,4 @@ -calitp-data-infra==2024.2.12 +calitp-data-infra==2024.2.12.post1 gusty==0.6.0 pyairtable==2.2.1 pydantic==1.9 diff --git a/jobs/gtfs-aggregator-scraper/poetry.lock b/jobs/gtfs-aggregator-scraper/poetry.lock index fe0521dea5..951507a15d 100644 --- a/jobs/gtfs-aggregator-scraper/poetry.lock +++ b/jobs/gtfs-aggregator-scraper/poetry.lock @@ -205,14 +205,14 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.2.12" +version = "2024.2.12.post1" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, - {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, + {file = "calitp_data_infra-2024.2.12.post1-py3-none-any.whl", hash = "sha256:388d18d1e305e7b56cd2821892ba538e58a9eac2418ac018838c316980efe434"}, + {file = "calitp_data_infra-2024.2.12.post1.tar.gz", hash = "sha256:743640b6d97154311f1e06cb9068ea98a60afe3f0e5aa7050d3bdf5562617c90"}, ] [package.dependencies] @@ -1616,4 +1616,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "~3.9" -content-hash = "07720c6d3235c17e2ef50c040178ed609610fc9c803148cee0add464784eac19" +content-hash = "35389ecaa0a30f85cd3cd5d087cf802ebcb7ff888b90065269373c0707565923" diff --git a/jobs/gtfs-aggregator-scraper/pyproject.toml b/jobs/gtfs-aggregator-scraper/pyproject.toml index 731daa23f7..1c3fd685c9 100644 --- a/jobs/gtfs-aggregator-scraper/pyproject.toml +++ b/jobs/gtfs-aggregator-scraper/pyproject.toml @@ -7,7 +7,7 @@ authors = ["Andrew Vaccaro "] [tool.poetry.dependencies] python = "~3.9" typer = "^0.7.0" -calitp-data-infra = "2024.2.12" +calitp-data-infra = "2024.2.12.post1.post1" [tool.poetry.dev-dependencies] pytest = "^7.2.0" diff --git a/jobs/gtfs-rt-parser-v2/poetry.lock b/jobs/gtfs-rt-parser-v2/poetry.lock index 6aa2129305..928eff05c3 100644 --- a/jobs/gtfs-rt-parser-v2/poetry.lock +++ b/jobs/gtfs-rt-parser-v2/poetry.lock @@ -205,14 +205,14 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.2.12" +version = "2024.2.12.post1" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, - {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, + {file = "calitp_data_infra-2024.2.12.post1-py3-none-any.whl", hash = "sha256:388d18d1e305e7b56cd2821892ba538e58a9eac2418ac018838c316980efe434"}, + {file = "calitp_data_infra-2024.2.12.post1.tar.gz", hash = "sha256:743640b6d97154311f1e06cb9068ea98a60afe3f0e5aa7050d3bdf5562617c90"}, ] [package.dependencies] @@ -2222,4 +2222,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.10" -content-hash = "3fc60713e876bf0de25a42ffb2c207e51e6e6351012c89998215278d2c854310" +content-hash = "bd810979e1a2855c45e5f29448450f727eeecc8d996f0dc12b7f8fe1942783a4" diff --git a/jobs/gtfs-rt-parser-v2/pyproject.toml b/jobs/gtfs-rt-parser-v2/pyproject.toml index 7b8acb520a..348a3a0cae 100644 --- a/jobs/gtfs-rt-parser-v2/pyproject.toml +++ b/jobs/gtfs-rt-parser-v2/pyproject.toml @@ -16,7 +16,7 @@ typer = "^0.6.1" protobuf = "^3.20.2" backoff = "^2.2.1" sentry-sdk = "^1.12.1" -calitp-data-infra = "2024.2.12" +calitp-data-infra = "2024.2.12.post1.post1" [tool.poetry.dev-dependencies] pytest = "^7.1.2" diff --git a/jobs/gtfs-schedule-validator/poetry.lock b/jobs/gtfs-schedule-validator/poetry.lock index 86dc06ea1e..558e811e0a 100644 --- a/jobs/gtfs-schedule-validator/poetry.lock +++ b/jobs/gtfs-schedule-validator/poetry.lock @@ -180,14 +180,14 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.2.12" +version = "2024.2.12.post1" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, - {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, + {file = "calitp_data_infra-2024.2.12.post1-py3-none-any.whl", hash = "sha256:388d18d1e305e7b56cd2821892ba538e58a9eac2418ac018838c316980efe434"}, + {file = "calitp_data_infra-2024.2.12.post1.tar.gz", hash = "sha256:743640b6d97154311f1e06cb9068ea98a60afe3f0e5aa7050d3bdf5562617c90"}, ] [package.dependencies] @@ -1655,4 +1655,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.10" -content-hash = "ca00f578895384f5c0160604520c3ea83214a4a84cc9e7c685d703fac766c38d" +content-hash = "db9586d53242306835849465ed6bf5abe8dd15ff60f73b7f59c1e12cf3e1a622" diff --git a/jobs/gtfs-schedule-validator/pyproject.toml b/jobs/gtfs-schedule-validator/pyproject.toml index 99117b95de..0a2b220c18 100644 --- a/jobs/gtfs-schedule-validator/pyproject.toml +++ b/jobs/gtfs-schedule-validator/pyproject.toml @@ -16,7 +16,7 @@ tqdm = "^4.64.0" backoff = "^2.2.1" python-slugify = "^7.0.0" sentry-sdk = "^1.12.1" -calitp-data-infra = "2024.2.12" +calitp-data-infra = "2024.2.12.post1.post1" [tool.poetry.dev-dependencies] pytest = "^5.2" diff --git a/script/poetry.lock b/script/poetry.lock index b6be77ef93..7eb908d672 100644 --- a/script/poetry.lock +++ b/script/poetry.lock @@ -169,14 +169,14 @@ files = [ [[package]] name = "calitp-data-infra" -version = "2024.2.12" +version = "2024.2.12.post1" description = "Shared code for developing data pipelines that process Cal-ITP data." category = "main" optional = false python-versions = ">=3.8,<3.10" files = [ - {file = "calitp_data_infra-2024.2.12-py3-none-any.whl", hash = "sha256:f0588c983346d6f6bb3d0c87de8474577eabd011150ab86c56df8b5c0a4d9f0c"}, - {file = "calitp_data_infra-2024.2.12.tar.gz", hash = "sha256:6205cdb6bc3c062ca53b4b156c9d1a8a30d6b3fb03e452d6a41b029ccc2879ec"}, + {file = "calitp_data_infra-2024.2.12.post1-py3-none-any.whl", hash = "sha256:388d18d1e305e7b56cd2821892ba538e58a9eac2418ac018838c316980efe434"}, + {file = "calitp_data_infra-2024.2.12.post1.tar.gz", hash = "sha256:743640b6d97154311f1e06cb9068ea98a60afe3f0e5aa7050d3bdf5562617c90"}, ] [package.dependencies] @@ -1639,4 +1639,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "~3.9" -content-hash = "e2d4e3b7e44f58ca54a6b4532cd64654908e0eb2f1648852c1b4b38543bdd0bf" +content-hash = "e1e79727b5c72ba47ee75d8da036b2befcc38bac51a22c702b1234cad982bf52" diff --git a/script/pyproject.toml b/script/pyproject.toml index 35842dd111..3d592b2cad 100644 --- a/script/pyproject.toml +++ b/script/pyproject.toml @@ -12,7 +12,7 @@ requests = "^2.28.2" jsonschema = "^4.17.3" typer = "^0.7.0" openpyxl = "^3.1.0" -calitp-data-infra = "2024.2.12" +calitp-data-infra = "2024.2.12.post1.post1" [tool.poetry.dev-dependencies] mypy = "^1.0.0" From c97e04804bc2d5e0cf0e51383022cbcdbe64a115 Mon Sep 17 00:00:00 2001 From: Soren Spicknall Date: Mon, 12 Feb 2024 11:24:51 -0600 Subject: [PATCH 5/6] Revert airflow dep --- airflow/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airflow/requirements.txt b/airflow/requirements.txt index cb975db87a..bfe313a695 100644 --- a/airflow/requirements.txt +++ b/airflow/requirements.txt @@ -1,4 +1,4 @@ -calitp-data-infra==2024.2.12.post1 +calitp-data-infra==2024.1.3 gusty==0.6.0 pyairtable==2.2.1 pydantic==1.9 From 2794c882472f6c53445b96ce990e225818871114 Mon Sep 17 00:00:00 2001 From: Soren Spicknall Date: Mon, 12 Feb 2024 11:28:12 -0600 Subject: [PATCH 6/6] Correct version number --- jobs/gtfs-aggregator-scraper/pyproject.toml | 2 +- jobs/gtfs-rt-parser-v2/pyproject.toml | 2 +- jobs/gtfs-schedule-validator/pyproject.toml | 2 +- script/pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/gtfs-aggregator-scraper/pyproject.toml b/jobs/gtfs-aggregator-scraper/pyproject.toml index 1c3fd685c9..3dec6cbc37 100644 --- a/jobs/gtfs-aggregator-scraper/pyproject.toml +++ b/jobs/gtfs-aggregator-scraper/pyproject.toml @@ -7,7 +7,7 @@ authors = ["Andrew Vaccaro "] [tool.poetry.dependencies] python = "~3.9" typer = "^0.7.0" -calitp-data-infra = "2024.2.12.post1.post1" +calitp-data-infra = "2024.2.12.post1" [tool.poetry.dev-dependencies] pytest = "^7.2.0" diff --git a/jobs/gtfs-rt-parser-v2/pyproject.toml b/jobs/gtfs-rt-parser-v2/pyproject.toml index 348a3a0cae..cf6d3c3c01 100644 --- a/jobs/gtfs-rt-parser-v2/pyproject.toml +++ b/jobs/gtfs-rt-parser-v2/pyproject.toml @@ -16,7 +16,7 @@ typer = "^0.6.1" protobuf = "^3.20.2" backoff = "^2.2.1" sentry-sdk = "^1.12.1" -calitp-data-infra = "2024.2.12.post1.post1" +calitp-data-infra = "2024.2.12.post1" [tool.poetry.dev-dependencies] pytest = "^7.1.2" diff --git a/jobs/gtfs-schedule-validator/pyproject.toml b/jobs/gtfs-schedule-validator/pyproject.toml index 0a2b220c18..ae737d1936 100644 --- a/jobs/gtfs-schedule-validator/pyproject.toml +++ b/jobs/gtfs-schedule-validator/pyproject.toml @@ -16,7 +16,7 @@ tqdm = "^4.64.0" backoff = "^2.2.1" python-slugify = "^7.0.0" sentry-sdk = "^1.12.1" -calitp-data-infra = "2024.2.12.post1.post1" +calitp-data-infra = "2024.2.12.post1" [tool.poetry.dev-dependencies] pytest = "^5.2" diff --git a/script/pyproject.toml b/script/pyproject.toml index 3d592b2cad..8dd357dbf5 100644 --- a/script/pyproject.toml +++ b/script/pyproject.toml @@ -12,7 +12,7 @@ requests = "^2.28.2" jsonschema = "^4.17.3" typer = "^0.7.0" openpyxl = "^3.1.0" -calitp-data-infra = "2024.2.12.post1.post1" +calitp-data-infra = "2024.2.12.post1" [tool.poetry.dev-dependencies] mypy = "^1.0.0"