Skip to content

Commit

Permalink
Remove base-python gradle dependencies in connectors where base-pytho…
Browse files Browse the repository at this point in the history
…n is not used (#7499)

* Remeve base-python references.

* Add requirements.txt

* Fix requirements.txt blank line

* Fix source-exchange rates to common CDK approach

* Fix source-smartsheets SAT.
Fix source-exchange-rates build.gradle.

* Bump docker version

* Update source-dixa SAT config

* Fix source-exchange-rates SAT config

* Revert bump scaffold sources version

* Fix source-shortio SAT config

* Fix source-square invalid_config.json

* Fix source-us-census invalid_config.json

* Fix source-intercom versioning
  • Loading branch information
htrueman committed Nov 10, 2021
1 parent e8b8530 commit 504580d
Show file tree
Hide file tree
Showing 110 changed files with 216 additions and 236 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "0b5c867e-1b12-4d02-ab74-97b2184ff6d7",
"name": "Dixa",
"dockerRepository": "airbyte/source-dixa",
"dockerImageTag": "0.1.1",
"dockerImageTag": "0.1.2",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/dixa"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "137ece28-5434-455c-8f34-69dc3782f451",
"name": "LinkedIn Ads",
"dockerRepository": "airbyte/source-linkedin-ads",
"dockerImageTag": "0.1.1",
"dockerImageTag": "0.1.2",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/linkedin-ads"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "200330b2-ea62-4d11-ac6d-cfe3e3f8ab2b",
"name": "Snapchat Marketing",
"dockerRepository": "airbyte/source-snapchat-marketing",
"dockerImageTag": "0.1.1",
"dockerImageTag": "0.1.2",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/snapchat-marketing"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "374ebc65-6636-4ea0-925c-7d35999a8ffc",
"name": "Smartsheets",
"dockerRepository": "airbyte/source-smartsheets",
"dockerImageTag": "0.1.5",
"dockerImageTag": "0.1.6",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/smartsheets"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "47f17145-fe20-4ef5-a548-e29b048adf84",
"name": "Apify Dataset",
"dockerRepository": "airbyte/source-apify-dataset",
"dockerImageTag": "0.1.1",
"dockerImageTag": "0.1.2",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/apify-dataset"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "4bfac00d-ce15-44ff-95b9-9e3c3e8fbd35",
"name": "TikTok Marketing",
"dockerRepository": "airbyte/source-tiktok-marketing",
"dockerImageTag": "0.1.0",
"dockerImageTag": "0.1.1",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/tiktok-marketing"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "59c5501b-9f95-411e-9269-7143c939adbd",
"name": "Bigcommerce",
"dockerRepository": "airbyte/source-bigcommerce",
"dockerImageTag": "0.1.0",
"dockerImageTag": "0.1.1",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/bigcommerce"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "69589781-7828-43c5-9f63-8925b1c1ccc2",
"name": "S3",
"dockerRepository": "airbyte/source-s3",
"dockerImageTag": "0.1.6",
"dockerImageTag": "0.1.7",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/s3"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "77225a51-cd15-4a13-af02-65816bd0ecf4",
"name": "Square",
"dockerRepository": "airbyte/source-square",
"dockerImageTag": "0.1.1",
"dockerImageTag": "0.1.2",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/square"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "8da67652-004c-11ec-9a03-0242ac130003",
"name": "Trello",
"dockerRepository": "airbyte/source-trello",
"dockerImageTag": "0.1.1",
"dockerImageTag": "0.1.2",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/trello"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceDefinitionId": "b3c1ecb8-f0de-11eb-9a03-0242ac130003",
"name": "Woocommerce",
"dockerRepository": "airbyte/source-woocommerce",
"dockerImageTag": "0.1.0",
"dockerImageTag": "0.1.1",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/woocommerce",
"icon": "woocommerce.svg"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceDefinitionId": "c2281cee-86f9-4a86-bb48-d23286b4c7bd",
"name": "Slack",
"dockerRepository": "airbyte/source-slack",
"dockerImageTag": "0.1.12",
"dockerImageTag": "0.1.13",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/slack",
"icon": "slack.svg"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "c4cfaeda-c757-489a-8aba-859fb08b6970",
"name": "US Census",
"dockerRepository": "airbyte/source-us-census",
"dockerImageTag": "0.1.0",
"dockerImageTag": "0.1.1",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/us-census"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceDefinitionId": "d8313939-3782-41b0-be29-b3ca20d8dd3a",
"name": "Intercom",
"dockerRepository": "airbyte/source-intercom",
"dockerImageTag": "0.1.7",
"dockerImageTag": "0.1.8",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/intercom",
"icon": "intercom.svg"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sourceDefinitionId": "d913b0f2-cc51-4e55-a44c-8ba1697b9239",
"name": "Paypal Transaction",
"dockerRepository": "airbyte/source-paypal-transaction",
"dockerImageTag": "0.1.1",
"dockerImageTag": "0.1.2",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/paypal-transaction"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceDefinitionId": "e2b40e36-aa0e-4bed-b41b-bcea6fa348b1",
"name": "Exchange Rates Api",
"dockerRepository": "airbyte/source-exchange-rates",
"dockerImageTag": "0.2.3",
"dockerImageTag": "0.2.4",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/exchangeratesapi",
"icon": "exchangeratesapi.svg"
}
32 changes: 16 additions & 16 deletions airbyte-config/init/src/main/resources/seed/source_definitions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- name: Apify Dataset
sourceDefinitionId: 47f17145-fe20-4ef5-a548-e29b048adf84
dockerRepository: airbyte/source-apify-dataset
dockerImageTag: 0.1.1
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/apify-dataset
sourceType: api
- name: Appstore
Expand All @@ -50,7 +50,7 @@
- name: BigCommerce
sourceDefinitionId: 59c5501b-9f95-411e-9269-7143c939adbd
dockerRepository: airbyte/source-bigcommerce
dockerImageTag: 0.1.0
dockerImageTag: 0.1.1
documentationUrl: https://docs.airbyte.io/integrations/sources/bigcommerce
sourceType: api
- name: BigQuery
Expand Down Expand Up @@ -117,7 +117,7 @@
- name: Dixa
sourceDefinitionId: 0b5c867e-1b12-4d02-ab74-97b2184ff6d7
dockerRepository: airbyte/source-dixa
dockerImageTag: 0.1.1
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/dixa
sourceType: api
- name: Drift
Expand All @@ -130,7 +130,7 @@
- name: Exchange Rates Api
sourceDefinitionId: e2b40e36-aa0e-4bed-b41b-bcea6fa348b1
dockerRepository: airbyte/source-exchange-rates
dockerImageTag: 0.2.3
dockerImageTag: 0.2.4
documentationUrl: https://docs.airbyte.io/integrations/sources/exchangeratesapi
icon: exchangeratesapi.svg
sourceType: api
Expand Down Expand Up @@ -261,7 +261,7 @@
- name: Intercom
sourceDefinitionId: d8313939-3782-41b0-be29-b3ca20d8dd3a
dockerRepository: airbyte/source-intercom
dockerImageTag: 0.1.7
dockerImageTag: 0.1.8
documentationUrl: https://docs.airbyte.io/integrations/sources/intercom
icon: intercom.svg
sourceType: api
Expand Down Expand Up @@ -299,7 +299,7 @@
- name: LinkedIn Ads
sourceDefinitionId: 137ece28-5434-455c-8f34-69dc3782f451
dockerRepository: airbyte/source-linkedin-ads
dockerImageTag: 0.1.1
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/linkedin-ads
sourceType: api
- name: Looker
Expand Down Expand Up @@ -385,7 +385,7 @@
- name: Paypal Transaction
sourceDefinitionId: d913b0f2-cc51-4e55-a44c-8ba1697b9239
dockerRepository: airbyte/source-paypal-transaction
dockerImageTag: 0.1.1
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/paypal-transaction
sourceType: api
- name: Paystack
Expand Down Expand Up @@ -474,7 +474,7 @@
- name: S3
sourceDefinitionId: 69589781-7828-43c5-9f63-8925b1c1ccc2
dockerRepository: airbyte/source-s3
dockerImageTag: 0.1.6
dockerImageTag: 0.1.7
documentationUrl: https://docs.airbyte.io/integrations/sources/s3
sourceType: file
- name: SalesLoft
Expand Down Expand Up @@ -506,26 +506,26 @@
- name: Short.io
sourceDefinitionId: 2fed2292-5586-480c-af92-9944e39fe12d
dockerRepository: airbyte/source-shortio
dockerImageTag: 0.1.0
dockerImageTag: 0.1.1
documentationUrl: https://docs.airbyte.io/integrations/sources/shortio
sourceType: api
- name: Slack
sourceDefinitionId: c2281cee-86f9-4a86-bb48-d23286b4c7bd
dockerRepository: airbyte/source-slack
dockerImageTag: 0.1.12
dockerImageTag: 0.1.13
documentationUrl: https://docs.airbyte.io/integrations/sources/slack
icon: slack.svg
sourceType: api
- name: Smartsheets
sourceDefinitionId: 374ebc65-6636-4ea0-925c-7d35999a8ffc
dockerRepository: airbyte/source-smartsheets
dockerImageTag: 0.1.5
dockerImageTag: 0.1.6
documentationUrl: https://docs.airbyte.io/integrations/sources/smartsheets
sourceType: api
- name: Snapchat Marketing
sourceDefinitionId: 200330b2-ea62-4d11-ac6d-cfe3e3f8ab2b
dockerRepository: airbyte/source-snapchat-marketing
dockerImageTag: 0.1.1
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/snapchat-marketing
sourceType: api
- name: Snowflake
Expand All @@ -537,7 +537,7 @@
- name: Square
sourceDefinitionId: 77225a51-cd15-4a13-af02-65816bd0ecf4
dockerRepository: airbyte/source-square
dockerImageTag: 0.1.1
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/square
sourceType: api
- sourceDefinitionId: 7a4327c4-315a-11ec-8d3d-0242ac130003
Expand Down Expand Up @@ -567,13 +567,13 @@
- name: TikTok Marketing
sourceDefinitionId: 4bfac00d-ce15-44ff-95b9-9e3c3e8fbd35
dockerRepository: airbyte/source-tiktok-marketing
dockerImageTag: 0.1.0
dockerImageTag: 0.1.1
documentationUrl: https://docs.airbyte.io/integrations/sources/tiktok-marketing
sourceType: api
- name: Trello
sourceDefinitionId: 8da67652-004c-11ec-9a03-0242ac130003
dockerRepository: airbyte/source-trello
dockerImageTag: 0.1.1
dockerImageTag: 0.1.2
documentationUrl: https://docs.airbyte.io/integrations/sources/trello
sourceType: api
- name: Twilio
Expand All @@ -591,7 +591,7 @@
- name: US Census
sourceDefinitionId: c4cfaeda-c757-489a-8aba-859fb08b6970
dockerRepository: airbyte/source-us-census
dockerImageTag: 0.1.0
dockerImageTag: 0.1.1
documentationUrl: https://docs.airbyte.io/integrations/sources/us-census
sourceType: api
- name: Zendesk Chat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
LABEL io.airbyte.version=0.1.2
LABEL io.airbyte.name=airbyte/source-apify-dataset
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@ plugins {
airbytePython {
moduleDirectory 'source_apify_dataset'
}

dependencies {
implementation files(project(':airbyte-integrations:bases:source-acceptance-test').airbyteDocker.outputs)
implementation files(project(':airbyte-integrations:bases:base-python').airbyteDocker.outputs)
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from setuptools import find_packages, setup

MAIN_REQUIREMENTS = ["airbyte-cdk", "apify-client~=0.0.1"]
MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1", "apify-client~=0.0.1"]

TEST_REQUIREMENTS = [
"pytest~=6.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-bigcommerce
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@ plugins {
airbytePython {
moduleDirectory 'source_bigcommerce'
}

dependencies {
implementation files(project(':airbyte-integrations:bases:source-acceptance-test').airbyteDocker.outputs)
implementation files(project(':airbyte-integrations:bases:base-python').airbyteDocker.outputs)
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from setuptools import find_packages, setup

MAIN_REQUIREMENTS = [
"airbyte-cdk",
"airbyte-cdk~=0.1",
]

TEST_REQUIREMENTS = [
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-dixa/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
LABEL io.airbyte.version=0.1.2
LABEL io.airbyte.name=airbyte/source-dixa
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tests:
- config_path: "secrets/config.json"
status: "succeed"
- config_path: "integration_tests/invalid_config.json"
status: "failed"
status: "exception"
discovery:
- config_path: "secrets/config.json"
basic_read:
Expand Down
5 changes: 0 additions & 5 deletions airbyte-integrations/connectors/source-dixa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@ plugins {
airbytePython {
moduleDirectory 'source_dixa'
}

dependencies {
implementation files(project(':airbyte-integrations:bases:source-acceptance-test').airbyteDocker.outputs)
implementation files(project(':airbyte-integrations:bases:base-python').airbyteDocker.outputs)
}
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-dixa/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from setuptools import find_packages, setup

MAIN_REQUIREMENTS = [
"airbyte-cdk",
"airbyte-cdk~=0.1",
]

TEST_REQUIREMENTS = [
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,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.2.3
LABEL io.airbyte.version=0.2.4
LABEL io.airbyte.name=airbyte/source-exchange-rates
14 changes: 7 additions & 7 deletions airbyte-integrations/connectors/source-exchange-rates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ The exchangerates API does not require authentication.

### Locally running the connector
```
python main_dev.py spec
python main_dev.py check --config sample_files/config.json
python main_dev.py discover --config sample_files/config.json
python main_dev.py read --config sample_files/config.json --catalog sample_files/configured_catalog.json
python main.py spec
python main.py check --config integration_tests/config.json
python main.py discover --config integration_tests/config.json
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
```

### Unit Tests
Expand Down Expand Up @@ -73,9 +73,9 @@ the Dockerfile.
Then run any of the connector commands as follows:
```
docker run --rm airbyte/source-exchange-rates:dev spec
docker run --rm -v $(pwd)/sample_files:/sample_files airbyte/source-exchange-rates:dev check --config /sample_files/config.json
docker run --rm -v $(pwd)/sample_files:/sample_files airbyte/source-exchange-rates:dev discover --config /sample_files/config.json
docker run --rm -v $(pwd)/sample_files:/sample_files airbyte/source-exchange-rates:dev read --config /sample_files/config.json --catalog /sample_files/configured_catalog.json
docker run --rm -v $(pwd)/integration_tests:/integration_tests airbyte/source-exchange-rates:dev check --config /integration_tests/config.json
docker run --rm -v $(pwd)/integration_tests:/integration_tests airbyte/source-exchange-rates:dev discover --config /integration_tests/config.json
docker run --rm -v $(pwd)/integration_tests:/integration_tests airbyte/source-exchange-rates:dev read --config /integration_tests/config.json --catalog /integration_tests/configured_catalog.json
```

### Integration Tests
Expand Down

0 comments on commit 504580d

Please sign in to comment.