Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[source-sentry] [source-sendgrid] [source-greenhouse] add .yaml to list of file imports in setup.py #15800

Merged
merged 15 commits into from
Aug 23, 2022
Merged

[source-sentry] [source-sendgrid] [source-greenhouse] add .yaml to list of file imports in setup.py #15800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a95aa93
add .yaml to list of file imports in setup.py
brianjlai Aug 19, 2022
65aa3dc
bump dockerfile version for sentry
brianjlai Aug 19, 2022
c87fb75
update sentry changelog
brianjlai Aug 19, 2022
08db31d
correct sentry, greenhouse, and sendgrid sources to correctly read co…
brianjlai Aug 19, 2022
a131a9c
add changelog
brianjlai Aug 19, 2022
e747101
update Dockerfile versions
brianjlai Aug 20, 2022
0379a4f
auto-bump connector version [ci skip]
octavia-squidington-iii Aug 20, 2022
826c2e1
Merge branch 'brian/fix_declarative_sentry' of https://github.com/air…
octavia-squidington-iii Aug 20, 2022
2739185
Merge branch 'master' into brian/fix_declarative_sentry
brianjlai Aug 20, 2022
13aff37
auto-bump connector version [ci skip]
octavia-squidington-iii Aug 20, 2022
dbc253e
fix greenhouse SAT tests and update to next version of cdk w/ schema …
brianjlai Aug 22, 2022
f3a18d4
Merge branch 'brian/fix_declarative_sentry' of github.com:airbytehq/a…
brianjlai Aug 22, 2022
4bc45b1
Merge branch 'master' into brian/fix_declarative_sentry
brianjlai Aug 23, 2022
4a7b0e5
auto-bump connector version [ci skip]
octavia-squidington-iii Aug 23, 2022
2eeaf79
Merge branch 'master' into brian/fix_declarative_sentry
brianjlai Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions airbyte-config/init/src/main/resources/seed/source_definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
- name: Greenhouse
sourceDefinitionId: 59f1e50a-331f-4f09-b3e8-2e8d4d355f44
dockerRepository: airbyte/source-greenhouse
dockerImageTag: 0.2.8
dockerImageTag: 0.2.9
documentationUrl: https://docs.airbyte.io/integrations/sources/greenhouse
icon: greenhouse.svg
sourceType: api
Expand Down Expand Up @@ -900,7 +900,7 @@
- name: Sendgrid
sourceDefinitionId: fbb5fbe2-16ad-4cf4-af7d-ff9d9c316c87
dockerRepository: airbyte/source-sendgrid
dockerImageTag: 0.2.10
dockerImageTag: 0.2.11
documentationUrl: https://docs.airbyte.io/integrations/sources/sendgrid
icon: sendgrid.svg
sourceType: api
Expand Down Expand Up @@ -1131,7 +1131,7 @@
- sourceDefinitionId: cdaf146a-9b75-49fd-9dd2-9d64a0bb4781
name: Sentry
dockerRepository: airbyte/source-sentry
dockerImageTag: 0.1.3
dockerImageTag: 0.1.4
documentationUrl: https://docs.airbyte.io/integrations/sources/sentry
icon: sentry.svg
sourceType: api
Expand Down
6 changes: 3 additions & 3 deletions airbyte-config/init/src/main/resources/seed/source_specs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3661,7 +3661,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-greenhouse:0.2.8"
- dockerImage: "airbyte/source-greenhouse:0.2.9"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/greenhouse"
connectionSpecification:
Expand Down Expand Up @@ -8880,7 +8880,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-sendgrid:0.2.10"
- dockerImage: "airbyte/source-sendgrid:0.2.11"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/sendgrid"
connectionSpecification:
Expand Down Expand Up @@ -11049,7 +11049,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-sentry:0.1.3"
- dockerImage: "airbyte/source-sentry:0.1.4"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/sentry"
connectionSpecification:
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connector-templates/source-configuration-based/setup.py.hbs
View file
Open in desktop
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~=0.1.76",
"airbyte-cdk~=0.1.79",
Copy link
Contributor Author

@brianjlai brianjlai Aug 22, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

technically this doesn't exist yet, but I will merge #15814 and publish 0.1.79 first which contains the fix for retrieving schemas while running from a job

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it now exists as of 8/22/22

]

TEST_REQUIREMENTS = [
Expand Down
2 changes: 1 addition & 1 deletion ...ns/connector-templates/source-configuration-based/source_{{snakeCase name}}/source.py.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ WARNING: Do not modify this file.
# Declarative Source
class Source{{properCase name}}(YamlDeclarativeSource):
def __init__(self):
super().__init__(**{"path_to_yaml": "./source_{{snakeCase name}}/{{snakeCase name}}.yaml"})
super().__init__(**{"path_to_yaml": "{{snakeCase name}}.yaml"})
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-greenhouse/Dockerfile
View file
Open in desktop
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.2.8
LABEL io.airbyte.version=0.2.9
LABEL io.airbyte.name=airbyte/source-greenhouse
14 changes: 7 additions & 7 deletions airbyte-integrations/connectors/source-greenhouse/integration_tests/expected_records.txt
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-greenhouse/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
author="Airbyte",
author_email="contact@airbyte.io",
packages=find_packages(),
install_requires=["airbyte-cdk~=0.1.74"],
package_data={"": ["*.json", "schemas/*.json"]},
install_requires=["airbyte-cdk~=0.1.79"],
package_data={"": ["*.json", "*.yaml", "schemas/*.json"]},
extras_require={
"tests": TEST_REQUIREMENTS,
},
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-greenhouse/source_greenhouse/source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# Declarative Source
class SourceGreenhouse(YamlDeclarativeSource):
def __init__(self):
super().__init__(**{"path_to_yaml": "./source_greenhouse/greenhouse.yaml"})
super().__init__(**{"path_to_yaml": "greenhouse.yaml"})
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-sendgrid/Dockerfile
View file
Open in desktop
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.2.10
LABEL io.airbyte.version=0.2.11
LABEL io.airbyte.name=airbyte/source-sendgrid
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-sendgrid/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
author="Airbyte",
author_email="contact@airbyte.io",
packages=find_packages(),
install_requires=["airbyte-cdk>=0.1.74", "backoff", "requests", "pytest==6.1.2", "pytest-mock"],
package_data={"": ["*.json", "schemas/*.json"]},
install_requires=["airbyte-cdk>=0.1.78", "backoff", "requests", "pytest==6.1.2", "pytest-mock"],
package_data={"": ["*.json", "*.yaml", "schemas/*.json"]},
)
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-sendgrid/source_sendgrid/source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# Declarative Source
class SourceSendgrid(YamlDeclarativeSource):
def __init__(self):
super().__init__(**{"path_to_yaml": "./source_sendgrid/sendgrid.yaml"})
super().__init__(**{"path_to_yaml": "sendgrid.yaml"})
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-sentry/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ COPY source_sentry ./source_sentry
ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]

LABEL io.airbyte.version=0.1.3
LABEL io.airbyte.version=0.1.4
LABEL io.airbyte.name=airbyte/source-sentry
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-sentry/setup.py
View file
Open in desktop
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~=0.1.74",
"airbyte-cdk~=0.1.78",
]

TEST_REQUIREMENTS = [
Expand All @@ -22,7 +22,7 @@
author_email="contact@airbyte.io",
packages=find_packages(),
install_requires=MAIN_REQUIREMENTS,
package_data={"": ["*.json", "schemas/*.json", "schemas/shared/*.json"]},
package_data={"": ["*.json", "*.yaml", "schemas/*.json", "schemas/shared/*.json"]},
extras_require={
"tests": TEST_REQUIREMENTS,
},
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-sentry/source_sentry/source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# Declarative Source
class SourceSentry(YamlDeclarativeSource):
def __init__(self):
super().__init__(**{"path_to_yaml": "./source_sentry/sentry.yaml"})
super().__init__(**{"path_to_yaml": "sentry.yaml"})
1 change: 1 addition & 0 deletions docs/integrations/sources/greenhouse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Please [create an issue](https://github.com/airbytehq/airbyte/issues) if you see

| Version | Date | Pull Request | Subject |
|:--------|:-----------|:---------------------------------------------------------|:---------------------------------------------------------------------------------|
| 0.2.9 | 2022-08-22 | [15800](https://github.com/airbytehq/airbyte/pull/15800) | Bugfix to allow reading sentry.yaml and schemas at runtime |
| 0.2.8 | 2022-08-10 | [15344](https://github.com/airbytehq/airbyte/pull/15344) | Migrate connector to config-based framework |
| 0.2.7 | 2022-04-15 | [11941](https://github.com/airbytehq/airbyte/pull/11941) | Correct Schema data type for Applications, Candidates, Scorecards and Users |
| 0.2.6 | 2021-11-08 | [7607](https://github.com/airbytehq/airbyte/pull/7607) | Implement demographics streams support. Update SAT for demographics streams |
Expand Down
1 change: 1 addition & 0 deletions docs/integrations/sources/sendgrid.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ The connector is restricted by normal Sendgrid [requests limitation](https://sen

| Version | Date | Pull Request | Subject |
|:--------| :--------- |:---------------------------------------------------------|:---------------------------------------------------|
| 0.2.11 | 2022-08-19 | [15800](https://github.com/airbytehq/airbyte/pull/15800) | Bugfix to allow reading sentry.yaml at runtime |
| 0.2.10 | 2022-08-17 | [15734](https://github.com/airbytehq/airbyte/pull/15734) | Fix yaml based on the new schema validator |
| 0.2.9 | 2022-08-11 | [15257](https://github.com/airbytehq/airbyte/pull/15257) | Migrate to config-based framework |
| 0.2.8 | 2022-06-07 | [13571](https://github.com/airbytehq/airbyte/pull/13571) | Add Message stream |
Expand Down
1 change: 1 addition & 0 deletions docs/integrations/sources/sentry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ The Sentry source connector supports the following [sync modes](https://docs.air

| Version | Date | Pull Request | Subject |
|:--------| :--------- | :------------------------------------------------------- |:--------------------------------------------------|
| 0.1.4 | 2022-08-19 | [15800](https://github.com/airbytehq/airbyte/pull/15800) | Bugfix to allow reading sentry.yaml at runtime |
| 0.1.3 | 2022-08-17 | [15734](https://github.com/airbytehq/airbyte/pull/15734) | Fix yaml based on the new schema validator |
| 0.1.2 | 2021-12-28 | [15345](https://github.com/airbytehq/airbyte/pull/15345) | Migrate to config-based framework |
| 0.1.1 | 2021-12-28 | [8628](https://github.com/airbytehq/airbyte/pull/8628) | Update fields in source-connectors specifications |
Expand Down