From 1e4f3166b111f1c32211af9747f9c5edf5fd1282 Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Mon, 15 Jan 2024 10:38:59 +0100 Subject: [PATCH 1/3] convert --- .../connectors/source-marketo/main.py | 9 ++------- .../connectors/source-marketo/metadata.yaml | 2 +- .../connectors/source-marketo/setup.py | 6 +++++- .../connectors/source-marketo/source_marketo/run.py | 13 +++++++++++++ docs/integrations/sources/marketo.md | 1 + 5 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 airbyte-integrations/connectors/source-marketo/source_marketo/run.py diff --git a/airbyte-integrations/connectors/source-marketo/main.py b/airbyte-integrations/connectors/source-marketo/main.py index 127c4d2c05ad0..4b7b8e8d1708c 100644 --- a/airbyte-integrations/connectors/source-marketo/main.py +++ b/airbyte-integrations/connectors/source-marketo/main.py @@ -2,12 +2,7 @@ # Copyright (c) 2023 Airbyte, Inc., all rights reserved. # - -import sys - -from airbyte_cdk.entrypoint import launch -from source_marketo import SourceMarketo +from source_marketo.run import run if __name__ == "__main__": - source = SourceMarketo() - launch(source, sys.argv[1:]) + run() diff --git a/airbyte-integrations/connectors/source-marketo/metadata.yaml b/airbyte-integrations/connectors/source-marketo/metadata.yaml index b8b9a21e5952c..6fb5daa2c2a96 100644 --- a/airbyte-integrations/connectors/source-marketo/metadata.yaml +++ b/airbyte-integrations/connectors/source-marketo/metadata.yaml @@ -10,7 +10,7 @@ data: connectorSubtype: api connectorType: source definitionId: 9e0556f4-69df-4522-a3fb-03264d36b348 - dockerImageTag: 1.2.4 + dockerImageTag: 1.2.5 dockerRepository: airbyte/source-marketo documentationUrl: https://docs.airbyte.com/integrations/sources/marketo githubIssueLabel: source-marketo diff --git a/airbyte-integrations/connectors/source-marketo/setup.py b/airbyte-integrations/connectors/source-marketo/setup.py index 1588bd2fc2a59..3653e41a901bd 100644 --- a/airbyte-integrations/connectors/source-marketo/setup.py +++ b/airbyte-integrations/connectors/source-marketo/setup.py @@ -17,7 +17,11 @@ ] setup( - name="source_marketo", + entry_points={ + "console_scripts": [ + "source-marketo=source_marketo.run:run", + ], + }, name="source_marketo", description="Source implementation for Marketo.", author="Airbyte", author_email="contact@airbyte.io", diff --git a/airbyte-integrations/connectors/source-marketo/source_marketo/run.py b/airbyte-integrations/connectors/source-marketo/source_marketo/run.py new file mode 100644 index 0000000000000..70154ec145a90 --- /dev/null +++ b/airbyte-integrations/connectors/source-marketo/source_marketo/run.py @@ -0,0 +1,13 @@ +# +# Copyright (c) 2023 Airbyte, Inc., all rights reserved. +# + + +import sys + +from airbyte_cdk.entrypoint import launch +from source_marketo import SourceMarketo + +def run(): + source = SourceMarketo() + launch(source, sys.argv[1:]) diff --git a/docs/integrations/sources/marketo.md b/docs/integrations/sources/marketo.md index 4be65376be1b3..1d5e2c1ac5634 100644 --- a/docs/integrations/sources/marketo.md +++ b/docs/integrations/sources/marketo.md @@ -117,6 +117,7 @@ If the 50,000 limit is too stringent, contact Marketo support for a quota increa | Version | Date | Pull Request | Subject | |:---------|:-----------|:---------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------| +| 1.2.5 | 2024-01-15 | [1234](https://github.com/airbytehq/airbyte/pull/1234) | prepare for airbyte-lib | | `1.2.4` | 2024-01-08 | [33999](https://github.com/airbytehq/airbyte/pull/33999) | Fix for `Export daily quota exceeded` | | `1.2.3` | 2023-08-02 | [28999](https://github.com/airbytehq/airbyte/pull/28999) | Fix for ` _csv.Error: line contains NUL` | | `1.2.2` | 2023-10-19 | [31599](https://github.com/airbytehq/airbyte/pull/31599) | Base image migration: remove Dockerfile and use the python-connector-base image | From 8be98c2f3c35d7a1e653a45f33f776dd524d1f9e Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Mon, 15 Jan 2024 10:47:21 +0100 Subject: [PATCH 2/3] format --- airbyte-integrations/connectors/source-marketo/setup.py | 3 ++- .../connectors/source-marketo/source_marketo/run.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-marketo/setup.py b/airbyte-integrations/connectors/source-marketo/setup.py index 3653e41a901bd..b8dfcde912ade 100644 --- a/airbyte-integrations/connectors/source-marketo/setup.py +++ b/airbyte-integrations/connectors/source-marketo/setup.py @@ -21,7 +21,8 @@ "console_scripts": [ "source-marketo=source_marketo.run:run", ], - }, name="source_marketo", + }, + name="source_marketo", description="Source implementation for Marketo.", author="Airbyte", author_email="contact@airbyte.io", diff --git a/airbyte-integrations/connectors/source-marketo/source_marketo/run.py b/airbyte-integrations/connectors/source-marketo/source_marketo/run.py index 70154ec145a90..0831c3167f5f7 100644 --- a/airbyte-integrations/connectors/source-marketo/source_marketo/run.py +++ b/airbyte-integrations/connectors/source-marketo/source_marketo/run.py @@ -8,6 +8,7 @@ from airbyte_cdk.entrypoint import launch from source_marketo import SourceMarketo + def run(): source = SourceMarketo() launch(source, sys.argv[1:]) From a331db1218edf4a4675a2214870b5ed254af165c Mon Sep 17 00:00:00 2001 From: Joe Reuter Date: Tue, 16 Jan 2024 12:42:43 +0100 Subject: [PATCH 3/3] Update marketo.md --- docs/integrations/sources/marketo.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/integrations/sources/marketo.md b/docs/integrations/sources/marketo.md index 1d5e2c1ac5634..5e5f7ad883fd5 100644 --- a/docs/integrations/sources/marketo.md +++ b/docs/integrations/sources/marketo.md @@ -117,7 +117,7 @@ If the 50,000 limit is too stringent, contact Marketo support for a quota increa | Version | Date | Pull Request | Subject | |:---------|:-----------|:---------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------| -| 1.2.5 | 2024-01-15 | [1234](https://github.com/airbytehq/airbyte/pull/1234) | prepare for airbyte-lib | +| 1.2.5 | 2024-01-15 | [34246](https://github.com/airbytehq/airbyte/pull/34246) | prepare for airbyte-lib | | `1.2.4` | 2024-01-08 | [33999](https://github.com/airbytehq/airbyte/pull/33999) | Fix for `Export daily quota exceeded` | | `1.2.3` | 2023-08-02 | [28999](https://github.com/airbytehq/airbyte/pull/28999) | Fix for ` _csv.Error: line contains NUL` | | `1.2.2` | 2023-10-19 | [31599](https://github.com/airbytehq/airbyte/pull/31599) | Base image migration: remove Dockerfile and use the python-connector-base image | @@ -140,4 +140,4 @@ If the 50,000 limit is too stringent, contact Marketo support for a quota increa | `0.1.3` | 2021-12-10 | [8429](https://github.com/airbytehq/airbyte/pull/8578) | Updated titles and descriptions | | `0.1.2` | 2021-12-03 | [8483](https://github.com/airbytehq/airbyte/pull/8483) | Improve field conversion to conform schema | | `0.1.1` | 2021-11-29 | [0000](https://github.com/airbytehq/airbyte/pull/0000) | Fix timestamp value format issue | -| `0.1.0` | 2021-09-06 | [5863](https://github.com/airbytehq/airbyte/pull/5863) | Release Marketo CDK Connector | \ No newline at end of file +| `0.1.0` | 2021-09-06 | [5863](https://github.com/airbytehq/airbyte/pull/5863) | Release Marketo CDK Connector |