Skip to content

Commit

Permalink
Merge branch 'master' into source-fb-marketing/add-learning-stage-info
Browse files Browse the repository at this point in the history
  • Loading branch information
gvillafanetapia committed Aug 14, 2024
2 parents c776d0f + 77924bb commit 7f2f8e8
Show file tree
Hide file tree
Showing 9,084 changed files with 770,901 additions and 286,338 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.57.1
current_version = 0.63.13
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
Expand Down
70 changes: 70 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
{
"name": "Java Development DevContainer (Generic)",
"image": "mcr.microsoft.com/devcontainers/java:0-17",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker": {},
"ghcr.io/devcontainers/features/java:1": {
"installGradle": true,
"version": "latest",
"jdkDistro": "open",
"gradleVersion": "7.5.1"
},
// Python needed for `airbyte-ci` CLI
"ghcr.io/devcontainers/features/python:1": {
"installGradle": true,
"version": "3.10",
"installTools": true
},
"ghcr.io/devcontainers-contrib/features/poetry:2": {}
},
// Deterministic order reduces cache busting
"overrideFeatureInstallOrder": [
"ghcr.io/devcontainers/features/docker-in-docker",
"ghcr.io/devcontainers/features/java",
"ghcr.io/devcontainers/features/python",
"ghcr.io/devcontainers-contrib/features/poetry"
],
// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
// Python extensions:
"charliermarsh.ruff",
"matangover.mypy",
"ms-python.python",
"ms-python.vscode-pylance",
// Toml support
"tamasfe.even-better-toml",
// Yaml and JSON Schema support:
"redhat.vscode-yaml",
// Contributing:
"GitHub.vscode-pull-request-github",
// General AI Auto-Complete (Python and Java)
"VisualStudioExptTeam.vscodeintellicode",
// Gradle and Java
"redhat.java",
"vscjava.vscode-gradle",
"vscjava.vscode-java-debug",
"vscjava.vscode-java-test",
"vscjava.vscode-java-dependency"
],
"settings": {
"extensions.ignoreRecommendations": true,
"git.openRepositoryInParentFolders": "always"
}
}
},
// Mark the root directory as 'safe' for git.
"initializeCommand": "git config --add safe.directory /workspaces/airbyte",
// Install Gradle, `airbyte-ci` CLI, and Dagger (installed via airbyte-ci --help)
"postCreateCommand": "make tools.airbyte-ci-dev.install",
"containerEnv": {
// Deterministic Poetry virtual env location: `./.venv`
"POETRY_VIRTUALENVS_IN_PROJECT": "true"
}
// Override to change the directory that the IDE opens by default:
// "workspaceFolder": "/workspaces/airbyte"
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
4 changes: 2 additions & 2 deletions .devcontainer/java-connectors-generic/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
// Mark the root directory as 'safe' for git.
"initializeCommand": "git config --add safe.directory /workspaces/airbyte",

// Install Gradle, `airbyte-ci` CLI, and Dagger (installed via airbyte-ci --help)
"postCreateCommand": "./gradlew --version && pipx install --editable ./airbyte-ci/connectors/pipelines/ || airbyte-ci --help || true",
// Install `airbyte-ci` and Gradle
"postCreateCommand": "make tools.airbyte-ci-dev.install && ./gradlew --version",

"containerEnv": {
// Deterministic Poetry virtual env location: `./.venv`
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/python-connectors-generic/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"name": "Python Development DevContainer (Generic)",

"image": "mcr.microsoft.com/devcontainers/python:0-3.10",
"image": "mcr.microsoft.com/devcontainers/python:1-3.10",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker": {},
"ghcr.io/devcontainers/features/python:1": {
Expand Down
20 changes: 14 additions & 6 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
/airbyte-integrations/connectors/destination-milvus @airbytehq/ai-language-models
/airbyte-integrations/connectors/destination-qdrant @airbytehq/ai-language-models
/airbyte-integrations/connectors/destination-chroma @airbytehq/ai-language-models
/airbyte-integrations/connectors/destination-snowflake-cortex @airbytehq/ai-language-models
/airbyte-cdk/python/airbyte_cdk/destinations/vector_db_based @airbytehq/ai-language-models

# CI/CD
/.github/ @airbytehq/connector-extensibility
/airbyte-ci/ @airbytehq/connector-extensibility
/.github/ @airbytehq/dev-tooling
/airbyte-ci/ @airbytehq/dev-tooling

# Python CDK and Connector Acceptance Tests
/airbyte-cdk/python @airbytehq/connector-extensibility
/airbyte-integrations/connector-templates/ @airbytehq/connector-extensibility
/airbyte-integrations/bases/connector-acceptance-test/ @airbytehq/connector-extensibility @lazebnyi @oustynova
/airbyte-cdk/python @airbytehq/python-team
/airbyte-integrations/connector-templates/ @airbytehq/dev-marketplace-contributions
/airbyte-integrations/bases/connector-acceptance-test/ @airbytehq/dev-tooling

# Build customization file change
/airbyte-integrations/connectors/**/build_customization.py @airbytehq/connector-extensibility
/airbyte-integrations/connectors/**/build_customization.py @airbytehq/dev-tooling

# Protocol related items
/docs/understanding-airbyte/airbyte-protocol.md @airbytehq/protocol-reviewers
Expand Down Expand Up @@ -51,3 +52,10 @@
/airbyte-integrations/connectors/destination-s3/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-snowflake/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-redshift/ @airbytehq/destinations

# Python critical connectors
/airbyte-integrations/connectors/source-facebook-marketing/ @airbytehq/python-team
/airbyte-integrations/connectors/source-hubspot/ @airbytehq/python-team
/airbyte-integrations/connectors/source-salesforce/ @airbytehq/python-team
/airbyte-integrations/connectors/source-shopify/ @airbytehq/python-team
/airbyte-integrations/connectors/source-stripe/ @airbytehq/python-team
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2-issue-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ body:
- type: textarea
id: description
attributes:
label: Revelant information
label: Relevant information
description: Please give any additional information you have and steps to reproduce the problem.
- type: textarea
id: logs
Expand Down
52 changes: 0 additions & 52 deletions .github/ISSUE_TEMPLATE/2-issue-helm.yaml

This file was deleted.

52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/3-issue-helm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: 🐛 [helm] Report a platform, infra or deployment bug
description: Use this template when you have a problem operating Airbyte platform on Helm/Kubernetes
labels: [type/bug, area/platform, needs-triage]
body:
- type: markdown
attributes:
value: >
<p align="center">
<a target="_blank" href="https://airbyte.com">
<image>
<source srcset="https://raw.githubusercontent.com/airbytehq/airbyte/master/.github/octavia-issue-template.svg">
<img alt="octavia-welcome" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/.github/octavia-issue-template.svg" width="auto" height="120">
</image>
</a>
</p>
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report...
Make sure to update this issue with a concise title and provide all information you have to
help us debug the problem together. Issues not following the template will be closed.
- type: input
id: platform-version
attributes:
label: Helm Chart Version
description: "What is the Helm Chart App version you're using"
validations:
required: true
- type: dropdown
id: step
attributes:
label: What step the error happened?
multiple: false
options:
- On deploy
- During the Sync
- Upgrading the Platform or Helm Chart
- Other
- type: textarea
id: description
attributes:
label: Relevant information
description: Please give any additional information you have and steps to reproduce the problem.
- type: textarea
id: logs
attributes:
label: Relevant log output
description: |
Please copy and paste any relevant log output.
This will be automatically formatted into code, so no need for backticks.
We strongly recommend to upload the log file for further debugging.
render: shell
88 changes: 88 additions & 0 deletions .github/ISSUE_TEMPLATE/4-issue-abctl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: 🐛 [abctl] Report an issue with the abctl tool
description: Use this template when you experience an issue with the abctl tool
labels: [type/bug, area/abctl, needs-triage]
body:
- type: markdown
attributes:
value: >
<p align="center">
<a target="_blank" href="https://airbyte.com">
<image>
<source srcset="https://raw.githubusercontent.com/airbytehq/airbyte/master/.github/octavia-issue-template.svg">
<img alt="octavia-welcome" src="https://raw.githubusercontent.com/airbytehq/airbyte/master/.github/octavia-issue-template.svg" width="auto" height="120">
</image>
</a>
</p>
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report...
Make sure to update this issue with a concise title and provide all information you have to
help us debug the problem together. Issues not following the template will be closed.
- type: textarea
id: problem
attributes:
label: What happened?
description: Please give any additional information you have and steps to reproduce the problem.
validations:
required: true
- type: textarea
id: expected
attributes:
label: What did you expect to happen?
validations:
required: true
- type: textarea
id: abctlVersion
attributes:
label: Abctl Version
value: |
<details>
```console
$ abctl version
# paste output here
```
</details>
validations:
required: true
- type: textarea
id: dockerVersion
attributes:
label: Docker Version
value: |
<details>
```console
$ docker version
# paste output here
```
</details>
validations:
required: true
- type: textarea
id: osVersion
attributes:
label: OS Version
value: |
<details>
```console
# On Linux:
$ cat /etc/os-release
# paste output here
# On Mac:
$ uname -a
# paste output here
# On Windows:
C:\> wmic os get Caption, Version, BuildNumber, OSArchitecture
# paste output here
```
</details>
validations:
required: true
Loading

0 comments on commit 7f2f8e8

Please sign in to comment.