From 07ebba0ce699d14a8253693331d2547cdfcea219 Mon Sep 17 00:00:00 2001 From: Catherine Noll Date: Thu, 1 Feb 2024 12:52:11 -0500 Subject: [PATCH] Source S3: pin CDK and moto (#34665) --- .../connectors/source-s3/acceptance-test-config.yml | 3 --- airbyte-integrations/connectors/source-s3/metadata.yaml | 2 +- airbyte-integrations/connectors/source-s3/setup.py | 5 +++-- docs/integrations/sources/s3.md | 3 ++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/airbyte-integrations/connectors/source-s3/acceptance-test-config.yml b/airbyte-integrations/connectors/source-s3/acceptance-test-config.yml index 7b253a10ef62..958efc6481a3 100644 --- a/airbyte-integrations/connectors/source-s3/acceptance-test-config.yml +++ b/airbyte-integrations/connectors/source-s3/acceptance-test-config.yml @@ -218,9 +218,6 @@ acceptance_tests: status: failed discovery: tests: - - config_path: secrets/config_iam_role.json - backward_compatibility_tests_config: - disable_for_version: "4.4.0" # new authentication added - IAM role - config_path: secrets/config.json backward_compatibility_tests_config: disable_for_version: "4.0.3" # removing the `streams.*.file_type` field which was redundant with `streams.*.format` diff --git a/airbyte-integrations/connectors/source-s3/metadata.yaml b/airbyte-integrations/connectors/source-s3/metadata.yaml index 1446197f5bc7..5eea563f7ffa 100644 --- a/airbyte-integrations/connectors/source-s3/metadata.yaml +++ b/airbyte-integrations/connectors/source-s3/metadata.yaml @@ -10,7 +10,7 @@ data: connectorSubtype: file connectorType: source definitionId: 69589781-7828-43c5-9f63-8925b1c1ccc2 - dockerImageTag: 4.4.0 + dockerImageTag: 4.4.1 dockerRepository: airbyte/source-s3 documentationUrl: https://docs.airbyte.com/integrations/sources/s3 githubIssueLabel: source-s3 diff --git a/airbyte-integrations/connectors/source-s3/setup.py b/airbyte-integrations/connectors/source-s3/setup.py index aa86f2a7c246..20e149a89ce6 100644 --- a/airbyte-integrations/connectors/source-s3/setup.py +++ b/airbyte-integrations/connectors/source-s3/setup.py @@ -6,7 +6,7 @@ from setuptools import find_packages, setup MAIN_REQUIREMENTS = [ - "airbyte-cdk[file-based]>=0.57.7", + "airbyte-cdk[file-based]==0.59.2", # temporarily pin until concurrency can be released "smart-open[s3]==5.1.0", "wcmatch==8.4", "dill==0.3.4", @@ -14,7 +14,8 @@ "python-snappy==0.6.1", ] -TEST_REQUIREMENTS = ["requests-mock~=1.9.3", "pytest-mock~=3.6.1", "pytest~=6.1", "pandas==2.0.3", "docker", "moto"] +# temporarily pin moto due to use of `mock_sts`, which has been deprecated +TEST_REQUIREMENTS = ["requests-mock~=1.9.3", "pytest-mock~=3.6.1", "pytest~=6.1", "pandas==2.0.3", "docker", "moto==4.2.14"] setup( name="source_s3", diff --git a/docs/integrations/sources/s3.md b/docs/integrations/sources/s3.md index 2cea82eff718..613f72d7c938 100644 --- a/docs/integrations/sources/s3.md +++ b/docs/integrations/sources/s3.md @@ -321,7 +321,8 @@ To perform the text extraction from PDF and Docx files, the connector uses the [ | Version | Date | Pull Request | Subject | |:--------|:-----------|:----------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------| -| 4.4.0 | 2023-01-12 | [33818](https://github.com/airbytehq/airbyte/pull/33818) | Add IAM Role Authentication | +| 4.4.1 | 2024-01-30 | [34665](https://github.com/airbytehq/airbyte/pull/34665) | Pin moto & CDK version | +| 4.4.0 | 2024-01-12 | [33818](https://github.com/airbytehq/airbyte/pull/33818) | Add IAM Role Authentication | | 4.3.1 | 2024-01-04 | [33937](https://github.com/airbytehq/airbyte/pull/33937) | Prepare for airbyte-lib | | 4.3.0 | 2023-12-14 | [33411](https://github.com/airbytehq/airbyte/pull/33411) | Bump CDK version to auto-set primary key for document file streams and support raw txt files | | 4.2.4 | 2023-12-06 | [33187](https://github.com/airbytehq/airbyte/pull/33187) | Bump CDK version to hide source-defined primary key |