From 6479a20d4f884969cf33e7b6e6fecb261ec5aabb Mon Sep 17 00:00:00 2001 From: Serhii Date: Mon, 13 Dec 2021 12:34:26 +0200 Subject: [PATCH 01/17] Deleted user-agent, date_window_size, page_size_limit from spec.json file --- .../connectors/source-kustomer-singer/Dockerfile | 2 +- .../source_kustomer_singer/spec.json | 15 +++------------ docs/integrations/sources/kustomer.md | 1 + 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile b/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile index b6a77107527a..bd34964070c9 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile +++ b/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile @@ -12,5 +12,5 @@ RUN pip install . ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.1.0 +LABEL io.airbyte.version=0.1.1 LABEL io.airbyte.name=airbyte/source-kustomer diff --git a/airbyte-integrations/connectors/source-kustomer-singer/source_kustomer_singer/spec.json b/airbyte-integrations/connectors/source-kustomer-singer/source_kustomer_singer/spec.json index 4385e7ac70bb..2bc0565f0750 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/source_kustomer_singer/spec.json +++ b/airbyte-integrations/connectors/source-kustomer-singer/source_kustomer_singer/spec.json @@ -8,25 +8,16 @@ "additionalProperties": true, "properties": { "api_token": { + "title": "API Token", "type": "string", "description": "The API token for your Kustomer account", "airbyte_secret": true }, "start_date": { + "title": "Start Date", "type": "string", + "description": "The date from which you'd like to replicate the data", "examples": ["2019-01-01T00:00:00Z"] - }, - "user_agent": { - "type": "string", - "examples": "tap-kustomer " - }, - "date_window_size": { - "type": "string", - "description": "The integer number of days (between the from and to dates) for date-windowing through the date-filtered endpoints" - }, - "page_size_limit": { - "type": "string", - "description": "The integer number of records to return per API request" } } } diff --git a/docs/integrations/sources/kustomer.md b/docs/integrations/sources/kustomer.md index 82c8c57633c0..aebc016ec5ed 100644 --- a/docs/integrations/sources/kustomer.md +++ b/docs/integrations/sources/kustomer.md @@ -42,5 +42,6 @@ Kustomer has some [rate limit restrictions](https://developer.kustomer.com/kusto | Version | Date | Pull Request | Subject | | :--- | :--- | :--- | :--- | +| 0.1.0 | 2021-12-13 | [0000](https://github.com/airbytehq/airbyte/pull/0000) | Deleted `user-agent`, `date_window_size`, `page_size_limit` from `spec.json` file | | 0.1.0 | 2021-07-22 | [4550](https://github.com/airbytehq/airbyte/pull/4550) | Add Kustomer Source Connector | From dad7b664d0e9a9655ecb5001c755c72688c4fbe8 Mon Sep 17 00:00:00 2001 From: Serhii Date: Mon, 13 Dec 2021 12:55:09 +0200 Subject: [PATCH 02/17] Deleted TODO rows --- .../source-kustomer-singer/acceptance-test-config.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/acceptance-test-config.yml b/airbyte-integrations/connectors/source-kustomer-singer/acceptance-test-config.yml index 72e7f2c0f5b4..0cd76d2280ea 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/acceptance-test-config.yml +++ b/airbyte-integrations/connectors/source-kustomer-singer/acceptance-test-config.yml @@ -15,13 +15,7 @@ tests: - config_path: "secrets/config.json" configured_catalog_path: "integration_tests/configured_catalog.json" validate_output_from_all_streams: yes -# TODO uncomment this block to specify that the tests should assert the connector outputs the records provided in the input file a file -# expect_records: -# path: "integration_tests/expected_records.txt" -# extra_fields: no -# exact_order: no -# extra_records: yes - incremental: # TODO if your connector does not implement incremental sync, remove this block + incremental: - config_path: "secrets/config.json" configured_catalog_path: "integration_tests/configured_catalog.json" future_state_path: "integration_tests/abnormal_state.json" From 9be6ae13539b32c24e6ec3ee7aa34bec90b31966 Mon Sep 17 00:00:00 2001 From: Serhii Date: Mon, 13 Dec 2021 12:57:09 +0200 Subject: [PATCH 03/17] Updated version in docs --- docs/integrations/sources/kustomer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/kustomer.md b/docs/integrations/sources/kustomer.md index aebc016ec5ed..d17de087a5da 100644 --- a/docs/integrations/sources/kustomer.md +++ b/docs/integrations/sources/kustomer.md @@ -42,6 +42,6 @@ Kustomer has some [rate limit restrictions](https://developer.kustomer.com/kusto | Version | Date | Pull Request | Subject | | :--- | :--- | :--- | :--- | -| 0.1.0 | 2021-12-13 | [0000](https://github.com/airbytehq/airbyte/pull/0000) | Deleted `user-agent`, `date_window_size`, `page_size_limit` from `spec.json` file | +| 0.1.1 | 2021-12-13 | [0000](https://github.com/airbytehq/airbyte/pull/0000) | Deleted `user-agent`, `date_window_size`, `page_size_limit` from `spec.json` file | | 0.1.0 | 2021-07-22 | [4550](https://github.com/airbytehq/airbyte/pull/4550) | Add Kustomer Source Connector | From 29c5b3249abd4346084935ef0dfbebfcf249385b Mon Sep 17 00:00:00 2001 From: Serhii Date: Thu, 16 Dec 2021 17:19:55 +0200 Subject: [PATCH 04/17] Updated to review --- .../integration_tests/acceptance.py | 3 --- .../integration_tests/invalid_config.json | 7 ++----- .../integration_tests/sample_state.json | 12 ++++++++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/acceptance.py b/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/acceptance.py index 4b6c44dfc613..724da010a0ce 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/acceptance.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/acceptance.py @@ -10,7 +10,4 @@ @pytest.fixture(scope="session", autouse=True) def connector_setup(): - """This fixture is a placeholder for external resources that acceptance test might require.""" - # TODO: setup test dependencies yield - # TODO: clean up test dependencies diff --git a/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/invalid_config.json b/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/invalid_config.json index 8fd23860d586..83c81895ddfa 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/invalid_config.json +++ b/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/invalid_config.json @@ -1,7 +1,4 @@ { - "api_token": "api_token", - "start_date": "2021-01-01T00:00:00Z", - "user_agent": "tap-kustomer ", - "date_window_size": "60", - "page_size_limit": "100" + "api_token": "invalid_api_token", + "start_date": "0000-01-01T00:00:00Z" } diff --git a/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/sample_state.json b/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/sample_state.json index 3587e579822d..89e5dd5d1c44 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/sample_state.json +++ b/airbyte-integrations/connectors/source-kustomer-singer/integration_tests/sample_state.json @@ -1,5 +1,13 @@ { - "todo-stream-name": { - "todo-field-name": "value" + "bookmarks": { + "conversations": "2021-12-25T18:00:00Z", + "customers": "2021-12-25T18:00:00Z", + "kobjects": "2021-12-25T18:00:00Z", + "messages": "2021-12-25T18:00:00Z", + "notes": "2021-12-25T18:00:00Z", + "shortcuts": "2021-12-25T18:00:00Z", + "tags": "2021-12-25T18:00:00Z", + "teams": "2021-12-25T18:00:00Z", + "users": "2021-12-25T18:00:00Z" } } From a54d120e8cf5dbd9a61d346f17e39c65cb790a5b Mon Sep 17 00:00:00 2001 From: Serhii Lazebnyi <53845333+lazebnyi@users.noreply.github.com> Date: Fri, 17 Dec 2021 15:54:05 +0200 Subject: [PATCH 05/17] Updated PR number --- docs/integrations/sources/kustomer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/kustomer.md b/docs/integrations/sources/kustomer.md index d17de087a5da..cbd0471eebbe 100644 --- a/docs/integrations/sources/kustomer.md +++ b/docs/integrations/sources/kustomer.md @@ -42,6 +42,6 @@ Kustomer has some [rate limit restrictions](https://developer.kustomer.com/kusto | Version | Date | Pull Request | Subject | | :--- | :--- | :--- | :--- | -| 0.1.1 | 2021-12-13 | [0000](https://github.com/airbytehq/airbyte/pull/0000) | Deleted `user-agent`, `date_window_size`, `page_size_limit` from `spec.json` file | +| 0.1.1 | 2021-12-13 | [8738](https://github.com/airbytehq/airbyte/pull/8738) | Deleted `user-agent`, `date_window_size`, `page_size_limit` from `spec.json` file | | 0.1.0 | 2021-07-22 | [4550](https://github.com/airbytehq/airbyte/pull/4550) | Add Kustomer Source Connector | From da7de537a7686a64cb9c65b810027739aca926eb Mon Sep 17 00:00:00 2001 From: Serhii Lazebnyi <53845333+lazebnyi@users.noreply.github.com> Date: Fri, 17 Dec 2021 15:57:16 +0200 Subject: [PATCH 06/17] Updated airbyte name in Docker --- .../connectors/source-kustomer-singer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile b/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile index bd34964070c9..077148f3ffe5 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile +++ b/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile @@ -13,4 +13,4 @@ ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] LABEL io.airbyte.version=0.1.1 -LABEL io.airbyte.name=airbyte/source-kustomer +LABEL io.airbyte.name=airbyte/source-kustomer-singer From 8e7ee330a13c6caf9987f1816d1b34c95192b9ea Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 17 Dec 2021 16:06:55 +0200 Subject: [PATCH 07/17] Added version for tap-kustomer --- .../connectors/source-kustomer-singer/Dockerfile | 2 +- airbyte-integrations/connectors/source-kustomer-singer/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile b/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile index 077148f3ffe5..bd34964070c9 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile +++ b/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile @@ -13,4 +13,4 @@ ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] LABEL io.airbyte.version=0.1.1 -LABEL io.airbyte.name=airbyte/source-kustomer-singer +LABEL io.airbyte.name=airbyte/source-kustomer diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index 8e8a1a5a02e1..7b2eb0edd6aa 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -5,7 +5,7 @@ from setuptools import find_packages, setup MAIN_REQUIREMENTS = [ - "tap-kustomer", + "tap-kustomer~=1.0.2", "airbyte-cdk", ] From ae8b4c5d935e08f04b490bd811f2a1a5357c9175 Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 17 Dec 2021 16:22:21 +0200 Subject: [PATCH 08/17] Added fixed version for tap-kustomer --- airbyte-integrations/connectors/source-kustomer-singer/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index 7b2eb0edd6aa..4f942d619a09 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -5,7 +5,7 @@ from setuptools import find_packages, setup MAIN_REQUIREMENTS = [ - "tap-kustomer~=1.0.2", + "tap-kustomer==1.0.2", "airbyte-cdk", ] From 28e38715263dce74161e426fac235b9fc923047f Mon Sep 17 00:00:00 2001 From: Serhii Date: Fri, 17 Dec 2021 16:36:58 +0200 Subject: [PATCH 09/17] Deleted version for tap-kustomer --- airbyte-integrations/connectors/source-kustomer-singer/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index 4f942d619a09..8e8a1a5a02e1 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -5,7 +5,7 @@ from setuptools import find_packages, setup MAIN_REQUIREMENTS = [ - "tap-kustomer==1.0.2", + "tap-kustomer", "airbyte-cdk", ] From af519482cb7b65a55a70ce6eca19af6d68a60408 Mon Sep 17 00:00:00 2001 From: antixar Date: Wed, 22 Dec 2021 14:08:37 +0200 Subject: [PATCH 10/17] workaround for all singer lib --- .../source-kustomer-singer/setup.py | 51 ++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index 8e8a1a5a02e1..874cb5aa7b37 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -2,11 +2,54 @@ # Copyright (c) 2021 Airbyte, Inc., all rights reserved. # +import os +import shutil +from pathlib import Path from setuptools import find_packages, setup +from setuptools.command.develop import develop +from setuptools.command.egg_info import egg_info +from setuptools.command.install import install +from subprocess import check_call + + +def check_singer(): + tmp_dir = "/tmp/singer-python" + if not os.path.exists(tmp_dir): + check_call(f"git clone -b v5.8.1 git@github.com:singer-io/singer-python.git {tmp_dir}".split()) + setup_py = Path(tmp_dir) / "setup.py" + setup_py.write_text(setup_py.read_text().replace("jsonschema==", "jsonschema>=")) + check_call(f"pip install -U {tmp_dir}".split()) + + +class CustomInstallCommand(install): + + def run(self): + check_singer() + install.run(self) + if os.path.exists("/tmp/singer-python"): + shutil.rmtree("/tmp/singer-python") + + +class CustomDevelopCommand(develop): + def run(self): + check_singer() + develop.run(self) + if os.path.exists("/tmp/singer-python"): + shutil.rmtree("/tmp/singer-python") + + +class CustomEggInfoCommand(egg_info): + def run(self): + check_singer() + egg_info.run(self) + if os.path.exists("/tmp/singer-python"): + shutil.rmtree("/tmp/singer-python") + MAIN_REQUIREMENTS = [ + # "singer-python", "tap-kustomer", - "airbyte-cdk", + "airbyte-cdk~=0.1.25", ] TEST_REQUIREMENTS = [ @@ -21,8 +64,14 @@ author_email="contact@airbyte.io", packages=find_packages(), install_requires=MAIN_REQUIREMENTS, + cmdclass={ + 'install': CustomInstallCommand, + 'develop': CustomDevelopCommand, + 'egg_info': CustomEggInfoCommand, + }, package_data={"": ["*.json"]}, extras_require={ "tests": TEST_REQUIREMENTS, }, + ) From c38176d55368707116dfe01acbd223bfd77942cf Mon Sep 17 00:00:00 2001 From: Serhii Date: Wed, 22 Dec 2021 16:56:40 +0200 Subject: [PATCH 11/17] Updated Docker file to new template --- .../source-kustomer-singer/Dockerfile | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile b/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile index bd34964070c9..9bcb0a4305be 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile +++ b/airbyte-integrations/connectors/source-kustomer-singer/Dockerfile @@ -1,13 +1,37 @@ -FROM python:3.7-slim +FROM python:3.7.11-alpine3.14 as base + +# build and load all requirements +FROM base as builder +WORKDIR /airbyte/integration_code + +# upgrade pip to the latest version +RUN apk --no-cache upgrade \ + && pip install --upgrade pip \ + && apk --no-cache add tzdata \ + && apk --no-cache add git \ + && apk --no-cache add build-base -# Bash is installed for more convenient debugging. -RUN apt-get update && apt-get install -y bash && apt-get install -y gcc && rm -rf /var/lib/apt/lists/* +COPY setup.py ./ +# install necessary packages to a temporary folder +RUN pip install --prefix=/install . + +# build a clean environment +FROM base WORKDIR /airbyte/integration_code -COPY source_kustomer_singer ./source_kustomer_singer + +# copy all loaded and built libraries to a pure basic image +COPY --from=builder /install /usr/local +# add default timezone settings +COPY --from=builder /usr/share/zoneinfo/Etc/UTC /etc/localtime +RUN echo "Etc/UTC" > /etc/timezone + +# bash is installed for more convenient debugging. +RUN apk --no-cache add bash + +# copy payload code only COPY main.py ./ -COPY setup.py ./ -RUN pip install . +COPY source_kustomer_singer ./source_kustomer_singer ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] From de13671d22f60e1b465f079f8438d21a4f6326e1 Mon Sep 17 00:00:00 2001 From: Serhii Date: Wed, 22 Dec 2021 16:57:16 +0200 Subject: [PATCH 12/17] Updated link to singer repo --- .../connectors/source-kustomer-singer/setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index 874cb5aa7b37..8b1c1acf0386 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -15,7 +15,7 @@ def check_singer(): tmp_dir = "/tmp/singer-python" if not os.path.exists(tmp_dir): - check_call(f"git clone -b v5.8.1 git@github.com:singer-io/singer-python.git {tmp_dir}".split()) + check_call(f"git clone -b v5.8.1 https://github.com/singer-io/singer-python.git {tmp_dir}".split()) setup_py = Path(tmp_dir) / "setup.py" setup_py.write_text(setup_py.read_text().replace("jsonschema==", "jsonschema>=")) check_call(f"pip install -U {tmp_dir}".split()) @@ -47,9 +47,8 @@ def run(self): MAIN_REQUIREMENTS = [ - # "singer-python", "tap-kustomer", - "airbyte-cdk~=0.1.25", + "airbyte-cdk", ] TEST_REQUIREMENTS = [ From 495fba976257aa43f0e1a78e17dd678536f86389 Mon Sep 17 00:00:00 2001 From: Serhii Date: Wed, 22 Dec 2021 19:17:31 +0200 Subject: [PATCH 13/17] Add version to tap-kustomer --- .../connectors/source-kustomer-singer/setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index 8b1c1acf0386..f2c50804be2d 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -18,6 +18,8 @@ def check_singer(): check_call(f"git clone -b v5.8.1 https://github.com/singer-io/singer-python.git {tmp_dir}".split()) setup_py = Path(tmp_dir) / "setup.py" setup_py.write_text(setup_py.read_text().replace("jsonschema==", "jsonschema>=")) + setup_py.write_text(setup_py.read_text().replace("backoff==", "backoff>=")) + setup_py.write_text(setup_py.read_text().replace("requests==", "backoff>=")) check_call(f"pip install -U {tmp_dir}".split()) @@ -47,8 +49,8 @@ def run(self): MAIN_REQUIREMENTS = [ - "tap-kustomer", "airbyte-cdk", + "tap-kustomer==1.0.2", ] TEST_REQUIREMENTS = [ From 2ec351cff1253d9a4d21c53b79f87973ae85d5d2 Mon Sep 17 00:00:00 2001 From: Serhii Date: Wed, 22 Dec 2021 19:51:13 +0200 Subject: [PATCH 14/17] Specified tap-kustomer in requirements.txt --- .../connectors/source-kustomer-singer/requirements.txt | 1 + .../connectors/source-kustomer-singer/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/requirements.txt b/airbyte-integrations/connectors/source-kustomer-singer/requirements.txt index 7be17a56d745..409e46f95c41 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/requirements.txt +++ b/airbyte-integrations/connectors/source-kustomer-singer/requirements.txt @@ -1,3 +1,4 @@ # This file is autogenerated -- only edit if you know what you are doing. Use setup.py for declaring dependencies. -e ../../bases/source-acceptance-test -e . +tap-kustomer diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index f2c50804be2d..1172dc7fbe4d 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -48,9 +48,9 @@ def run(self): shutil.rmtree("/tmp/singer-python") +# tap-kustomer installed after source-kustomer-singer requirements (specified in requirements.txt) MAIN_REQUIREMENTS = [ - "airbyte-cdk", - "tap-kustomer==1.0.2", + "airbyte-cdk" ] TEST_REQUIREMENTS = [ From d34752daa7cfb626839fee7c7cc97740ac898231 Mon Sep 17 00:00:00 2001 From: Serhii Date: Wed, 22 Dec 2021 20:04:45 +0200 Subject: [PATCH 15/17] Commented source-acceptance-test dependences instalation --- .../connectors/source-kustomer-singer/requirements.txt | 3 +-- .../connectors/source-kustomer-singer/setup.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/requirements.txt b/airbyte-integrations/connectors/source-kustomer-singer/requirements.txt index 409e46f95c41..8e2cb6f446a2 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/requirements.txt +++ b/airbyte-integrations/connectors/source-kustomer-singer/requirements.txt @@ -1,4 +1,3 @@ # This file is autogenerated -- only edit if you know what you are doing. Use setup.py for declaring dependencies. --e ../../bases/source-acceptance-test +# -e ../../bases/source-acceptance-test -e . -tap-kustomer diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index 1172dc7fbe4d..37f0fd1b2890 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -48,9 +48,9 @@ def run(self): shutil.rmtree("/tmp/singer-python") -# tap-kustomer installed after source-kustomer-singer requirements (specified in requirements.txt) MAIN_REQUIREMENTS = [ "airbyte-cdk" + "tap-kustomer==1.0.2" ] TEST_REQUIREMENTS = [ From 5846850db1d68456ddf27e3da91ed453932954a6 Mon Sep 17 00:00:00 2001 From: Serhii Date: Wed, 22 Dec 2021 20:11:54 +0200 Subject: [PATCH 16/17] Fixed typo --- airbyte-integrations/connectors/source-kustomer-singer/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index 37f0fd1b2890..ce49388ac33b 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -49,7 +49,7 @@ def run(self): MAIN_REQUIREMENTS = [ - "airbyte-cdk" + "airbyte-cdk", "tap-kustomer==1.0.2" ] From 196e8e4ee8fd0f3614ea092e4e810d675ff0507d Mon Sep 17 00:00:00 2001 From: Serhii Date: Wed, 22 Dec 2021 20:19:53 +0200 Subject: [PATCH 17/17] Deleted source-acceptance-testfrom setup.py --- .../connectors/source-kustomer-singer/setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-kustomer-singer/setup.py b/airbyte-integrations/connectors/source-kustomer-singer/setup.py index ce49388ac33b..f82b4fffefed 100644 --- a/airbyte-integrations/connectors/source-kustomer-singer/setup.py +++ b/airbyte-integrations/connectors/source-kustomer-singer/setup.py @@ -54,8 +54,7 @@ def run(self): ] TEST_REQUIREMENTS = [ - "pytest~=6.1", - "source-acceptance-test", + "pytest~=6.1" ] setup(