From 3734295120b04635ad3d59b515e7139af77f081b Mon Sep 17 00:00:00 2001 From: ChristoGrab Date: Wed, 8 Jan 2025 12:42:58 -0800 Subject: [PATCH 1/3] fix: remove --no-update flag from poetry commands --- .../pipelines/airbyte_ci/connectors/generate_erd/pipeline.py | 2 +- .../pipelines/airbyte_ci/connectors/test/steps/common.py | 2 +- .../pipelines/airbyte_ci/connectors/upgrade_cdk/pipeline.py | 2 +- .../connectors/pipelines/pipelines/airbyte_ci/test/pipeline.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/generate_erd/pipeline.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/generate_erd/pipeline.py index 17b70bd2475c..a2e06b49ea8c 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/generate_erd/pipeline.py +++ b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/generate_erd/pipeline.py @@ -100,7 +100,7 @@ def _build_erd_container(self, connector_directory: Directory, discovered_catalo .with_workdir("/app") ) - return container.with_exec(["poetry", "lock", "--no-update"], use_entrypoint=True).with_exec( + return container.with_exec(["poetry", "lock"], use_entrypoint=True).with_exec( ["poetry", "install"], use_entrypoint=True ) diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py index 7fbd7c8a063f..fc9af2809ce2 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py +++ b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py @@ -828,7 +828,7 @@ async def _build_test_container(self, target_container_id: str) -> Container: ) ) - container = container.with_exec(["poetry", "lock", "--no-update"], use_entrypoint=True).with_exec( + container = container.with_exec(["poetry", "lock"], use_entrypoint=True).with_exec( ["poetry", "install"], use_entrypoint=True ) return container diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/upgrade_cdk/pipeline.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/upgrade_cdk/pipeline.py index a764dcef2bcc..193ee6885e2c 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/upgrade_cdk/pipeline.py +++ b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/upgrade_cdk/pipeline.py @@ -139,7 +139,7 @@ async def upgrade_cdk_version_for_python_connector(self, og_connector_dir: Direc connector_container = base_container.with_mounted_directory("/connector", updated_connector_dir).with_workdir("/connector") poetry_lock_file = await connector_container.file(POETRY_LOCK_FILENAME).contents() - updated_container = await connector_container.with_exec(["poetry", "lock", "--no-update"], use_entrypoint=True) + updated_container = await connector_container.with_exec(["poetry", "lock"], use_entrypoint=True) updated_poetry_lock_file = await updated_container.file(POETRY_LOCK_FILENAME).contents() if poetry_lock_file != updated_poetry_lock_file: diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/test/pipeline.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/test/pipeline.py index 3b7b758b5120..7c725c108345 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/test/pipeline.py +++ b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/test/pipeline.py @@ -239,7 +239,7 @@ def prepare_container_for_poe_tasks( ], use_entrypoint=True, ) - .with_exec(["poetry", "lock", "--no-update"], use_entrypoint=True) + .with_exec(["poetry", "lock"], use_entrypoint=True) ) # Install the poetry package From 7491821c9b01ce34f4a8d3682f1f65355751e882 Mon Sep 17 00:00:00 2001 From: ChristoGrab Date: Wed, 8 Jan 2025 12:49:31 -0800 Subject: [PATCH 2/3] chore: version bump --- airbyte-ci/connectors/pipelines/README.md | 1 + airbyte-ci/connectors/pipelines/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airbyte-ci/connectors/pipelines/README.md b/airbyte-ci/connectors/pipelines/README.md index 24d6ec381ae3..692d4ce3abfd 100644 --- a/airbyte-ci/connectors/pipelines/README.md +++ b/airbyte-ci/connectors/pipelines/README.md @@ -854,6 +854,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only | Version | PR | Description | |---------|------------------------------------------------------------| ---------------------------------------------------------------------------------------------------------------------------- | +| 4.48.3 | [#50988](https://github.com/airbytehq/airbyte/pull/50988) | Remove deprecated `--no-update` flag from poetry commands | | 4.48.2 | [#50871](https://github.com/airbytehq/airbyte/pull/50871) | Speed up connector modification detection. | | 4.48.1 | [#50410](https://github.com/airbytehq/airbyte/pull/50410) | Java connector build: give ownership of built artifacts to the current image user. | | 4.48.0 | [#49960](https://github.com/airbytehq/airbyte/pull/49960) | Deprecate airbyte-ci format command | diff --git a/airbyte-ci/connectors/pipelines/pyproject.toml b/airbyte-ci/connectors/pipelines/pyproject.toml index ab9e5aab6e2d..335a454732bd 100644 --- a/airbyte-ci/connectors/pipelines/pyproject.toml +++ b/airbyte-ci/connectors/pipelines/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pipelines" -version = "4.48.2" +version = "4.48.3" description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines" authors = ["Airbyte "] From 13097b99f79e20bd527285a2877d84974d8602ed Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Wed, 8 Jan 2025 21:02:14 +0000 Subject: [PATCH 3/3] chore: auto-fix lint and format issues --- .../pipelines/airbyte_ci/connectors/generate_erd/pipeline.py | 4 +--- .../pipelines/airbyte_ci/connectors/test/steps/common.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/generate_erd/pipeline.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/generate_erd/pipeline.py index a2e06b49ea8c..3c066307586b 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/generate_erd/pipeline.py +++ b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/generate_erd/pipeline.py @@ -100,9 +100,7 @@ def _build_erd_container(self, connector_directory: Directory, discovered_catalo .with_workdir("/app") ) - return container.with_exec(["poetry", "lock"], use_entrypoint=True).with_exec( - ["poetry", "install"], use_entrypoint=True - ) + return container.with_exec(["poetry", "lock"], use_entrypoint=True).with_exec(["poetry", "install"], use_entrypoint=True) class UploadDbmlSchema(Step): diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py index fc9af2809ce2..8afe9d708cd8 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py +++ b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/test/steps/common.py @@ -828,7 +828,5 @@ async def _build_test_container(self, target_container_id: str) -> Container: ) ) - container = container.with_exec(["poetry", "lock"], use_entrypoint=True).with_exec( - ["poetry", "install"], use_entrypoint=True - ) + container = container.with_exec(["poetry", "lock"], use_entrypoint=True).with_exec(["poetry", "install"], use_entrypoint=True) return container