From 32d11014340d6699bd44342db53834e5af6e26f3 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 30 Jun 2022 00:40:03 +0300 Subject: [PATCH 1/6] mergeable -> _mergeable Signed-off-by: Sergey Chvalyuk --- airbyte-integrations/connectors/source-github/Dockerfile | 2 +- .../connectors/source-github/source_github/streams.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-github/Dockerfile b/airbyte-integrations/connectors/source-github/Dockerfile index 5f2b7be57460..e8a78a4fc050 100644 --- a/airbyte-integrations/connectors/source-github/Dockerfile +++ b/airbyte-integrations/connectors/source-github/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.2.38 +LABEL io.airbyte.version=0.2.39 LABEL io.airbyte.name=airbyte/source-github diff --git a/airbyte-integrations/connectors/source-github/source_github/streams.py b/airbyte-integrations/connectors/source-github/source_github/streams.py index 30eebe39b72a..f7b7862a714b 100644 --- a/airbyte-integrations/connectors/source-github/source_github/streams.py +++ b/airbyte-integrations/connectors/source-github/source_github/streams.py @@ -721,6 +721,9 @@ def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapp record["repository"] = self._get_name(repository) if record["merged_by"]: record["merged_by"]["type"] = record["merged_by"].pop("__typename") + # to avoid conflict with old field 'mergeable' of type 'boolean' in REST API + if "mergeable" in record: + record["_mergeable"] = record.pop("mergeable") yield record def next_page_token(self, response: requests.Response) -> Optional[Mapping[str, Any]]: From 90907c1a0b04b71dc3cf91bb209ecc0638e99980 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 30 Jun 2022 00:43:45 +0300 Subject: [PATCH 2/6] github.md updated Signed-off-by: Sergey Chvalyuk --- docs/integrations/sources/github.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/integrations/sources/github.md b/docs/integrations/sources/github.md index e5f8248e99b3..1a85bff43bbc 100644 --- a/docs/integrations/sources/github.md +++ b/docs/integrations/sources/github.md @@ -141,6 +141,7 @@ The GitHub connector should not run into GitHub API limitations under normal usa | Version | Date | Pull Request | Subject | |:--------|:-----------| :--- |:-------------------------------------------------------------------------------------------------------------| +| 0.2.39 | 2022-06-30 | [14274](https://github.com/airbytehq/airbyte/pull/14274) | Change field: mergeable -> \_mergeable | | 0.2.38 | 2022-06-27 | [13989](https://github.com/airbytehq/airbyte/pull/13989) | Use GraphQL for `reviews` stream | | 0.2.37 | 2022-06-21 | [13955](https://github.com/airbytehq/airbyte/pull/13955) | Fix "secondary rate limit" not retrying | | 0.2.36 | 2022-06-20 | [13926](https://github.com/airbytehq/airbyte/pull/13926) | Break point added for `workflows_runs` stream | From 872f4fc704a047e5755a7a25f122f338ed479eb1 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 30 Jun 2022 00:46:04 +0300 Subject: [PATCH 3/6] schema mergeable -> _mergeable Signed-off-by: Sergey Chvalyuk --- .../source-github/source_github/schemas/pull_request_stats.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json b/airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json index 2185529c7980..5a3e4d1b078e 100644 --- a/airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json +++ b/airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json @@ -17,7 +17,7 @@ "merged": { "type": ["null", "boolean"] }, - "mergeable": { + "_mergeable": { "type": ["null", "string"] }, "can_be_rebased": { From c24bb28e4853d90942b5977a67c5ffc483ca444a Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 30 Jun 2022 08:14:36 +0300 Subject: [PATCH 4/6] github.md updated Signed-off-by: Sergey Chvalyuk --- docs/integrations/sources/github.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/github.md b/docs/integrations/sources/github.md index 1a85bff43bbc..dd94de5586cd 100644 --- a/docs/integrations/sources/github.md +++ b/docs/integrations/sources/github.md @@ -141,7 +141,7 @@ The GitHub connector should not run into GitHub API limitations under normal usa | Version | Date | Pull Request | Subject | |:--------|:-----------| :--- |:-------------------------------------------------------------------------------------------------------------| -| 0.2.39 | 2022-06-30 | [14274](https://github.com/airbytehq/airbyte/pull/14274) | Change field: mergeable -> \_mergeable | +| 0.2.39 | 2022-06-30 | [14274](https://github.com/airbytehq/airbyte/pull/14274) | Rename field `mergeable` to `_mergeable` | | 0.2.38 | 2022-06-27 | [13989](https://github.com/airbytehq/airbyte/pull/13989) | Use GraphQL for `reviews` stream | | 0.2.37 | 2022-06-21 | [13955](https://github.com/airbytehq/airbyte/pull/13955) | Fix "secondary rate limit" not retrying | | 0.2.36 | 2022-06-20 | [13926](https://github.com/airbytehq/airbyte/pull/13926) | Break point added for `workflows_runs` stream | From a6193b4f369d2eb901c7c6d5b14e6ab2341c840e Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 30 Jun 2022 13:50:27 +0300 Subject: [PATCH 5/6] fix: _mergeable -> is_mergeable Signed-off-by: Sergey Chvalyuk --- .../source-github/source_github/schemas/pull_request_stats.json | 2 +- .../connectors/source-github/source_github/streams.py | 2 +- docs/integrations/sources/github.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json b/airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json index 5a3e4d1b078e..a2f81dccff6b 100644 --- a/airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json +++ b/airbyte-integrations/connectors/source-github/source_github/schemas/pull_request_stats.json @@ -17,7 +17,7 @@ "merged": { "type": ["null", "boolean"] }, - "_mergeable": { + "is_mergeable": { "type": ["null", "string"] }, "can_be_rebased": { diff --git a/airbyte-integrations/connectors/source-github/source_github/streams.py b/airbyte-integrations/connectors/source-github/source_github/streams.py index f7b7862a714b..e7f8a40be687 100644 --- a/airbyte-integrations/connectors/source-github/source_github/streams.py +++ b/airbyte-integrations/connectors/source-github/source_github/streams.py @@ -723,7 +723,7 @@ def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapp record["merged_by"]["type"] = record["merged_by"].pop("__typename") # to avoid conflict with old field 'mergeable' of type 'boolean' in REST API if "mergeable" in record: - record["_mergeable"] = record.pop("mergeable") + record["is_mergeable"] = record.pop("mergeable") yield record def next_page_token(self, response: requests.Response) -> Optional[Mapping[str, Any]]: diff --git a/docs/integrations/sources/github.md b/docs/integrations/sources/github.md index dd94de5586cd..094810e73bed 100644 --- a/docs/integrations/sources/github.md +++ b/docs/integrations/sources/github.md @@ -141,7 +141,7 @@ The GitHub connector should not run into GitHub API limitations under normal usa | Version | Date | Pull Request | Subject | |:--------|:-----------| :--- |:-------------------------------------------------------------------------------------------------------------| -| 0.2.39 | 2022-06-30 | [14274](https://github.com/airbytehq/airbyte/pull/14274) | Rename field `mergeable` to `_mergeable` | +| 0.2.39 | 2022-06-30 | [14274](https://github.com/airbytehq/airbyte/pull/14274) | Rename field `mergeable` to `is_mergeable` | | 0.2.38 | 2022-06-27 | [13989](https://github.com/airbytehq/airbyte/pull/13989) | Use GraphQL for `reviews` stream | | 0.2.37 | 2022-06-21 | [13955](https://github.com/airbytehq/airbyte/pull/13955) | Fix "secondary rate limit" not retrying | | 0.2.36 | 2022-06-20 | [13926](https://github.com/airbytehq/airbyte/pull/13926) | Break point added for `workflows_runs` stream | From dc5f06b09bfb8e84454416447038e6e9ca433148 Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Thu, 30 Jun 2022 16:02:04 +0000 Subject: [PATCH 6/6] auto-bump connector version --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index 01639e5eb5ce..a2d397d95440 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -303,7 +303,7 @@ - name: GitHub sourceDefinitionId: ef69ef6e-aa7f-4af1-a01d-ef775033524e dockerRepository: airbyte/source-github - dockerImageTag: 0.2.38 + dockerImageTag: 0.2.39 documentationUrl: https://docs.airbyte.io/integrations/sources/github icon: github.svg sourceType: api diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index f930c62778c6..4124d6d69e8d 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -2584,7 +2584,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-github:0.2.38" +- dockerImage: "airbyte/source-github:0.2.39" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/github" connectionSpecification: