Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dolfinus committed Mar 21, 2024
2 parents 3214e75 + 157ceba commit c9b54df
Show file tree
Hide file tree
Showing 203 changed files with 7,335 additions and 1,064 deletions.
7 changes: 6 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
interval: weekly
labels:
- type:ci
# https://til.simonwillison.net/github/dependabot-python-setup
groups:
github-actions:
patterns:
- '*'
153 changes: 153 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
# config for https://github.com/marketplace/actions/github-labeler

- name: attention:help wanted
description: Extra attention is needed
color: bfdadc
from_name: help wanted

- name: attention:invalid
description: This doesn't seem right
color: ea2357
from_name: invalid

- name: ci:skip-changelog
description: Add this label to skip changelog file check
color: 04990f

- name: component:connection
description: Connection-related
color: 75aeb3

- name: component:db
description: DB-related
color: 5319e7

- name: component:file
description: DB-related
color: 75f526

- name: component:hooks
description: Hooks-related
color: 006b75

- name: component:hwm
description: HWM-related
color: 670f54

- name: component:plugins
description: Plugins-related
color: 77ba7b

- name: component:spark
description: Spark-related
color: e09183

- name: db:clickhouse
description: Clickhouse-related
color: 1d76db

- name: db:greenplum
description: Greenplum-related
color: c2e0c6

- name: db:hive
description: Hive-related
color: ef2895

- name: db:kafka
description: Kafka-related
color: f00a38

- name: db:mongodb
description: MongoDB-related
color: 1587c4

- name: db:mssql
description: MSSQL-related
color: ad368a

- name: db:mysql
description: MySQL-related
color: '473255'

- name: db:oracle
description: Oracle-related
color: '646821'

- name: db:postgres
description: Postgres-related
color: 1077a6

- name: db:teradata
description: Teradata-related
color: 04115d

- name: file:ftp
description: FTP-related
color: e41c74

- name: file:ftps
description: FTPS-related
color: 07c469

- name: file:hdfs
description: HDFS-related
color: 0295d0

- name: file:s3
description: S3-related
color: b0e8f9

- name: file:sftp
description: SFTP-related
color: 3e9d6d

- name: file:webdav
description: WebDAV-related
color: 6d1c10

- name: kind:bug
description: Something isn't working
color: d73a4a
from_name: bug

- name: kind:feature
description: New feature or request
color: 389a3f

- name: kind:improvement
description: Improvement of some existing feature
color: 1a92c2
from_name: enhancement

- name: kind:question
description: Further information is requested
color: 0e857c
from_name: question

- name: resolution:duplicate
description: This issue or pull request already exists
color: cfd3d7
from_name: duplicate

- name: resolution:wontfix
description: This will not be worked on
color: ec103b
from_name: wontfix

- name: type:ci
description: CI-related changes
color: cdb0bd

- name: type:dependency
description: Dependency-related changes
color: 214efe

- name: type:documentation
description: Improvements or additions to documentation
color: 6b9f54
from_name: documentation

- name: type:tests
description: Tests-related changes
color: 5cca5b
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'dependabot[bot]'

steps:
- uses: alexwilson/enable-github-automerge-action@1.0.0
- uses: alexwilson/enable-github-automerge-action@2.0.0
with:
github-token: ${{ secrets.AUTOMERGE_TOKEN }}
merge-method: REBASE
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/data/base/tracked.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
.github/workflows/data/base/**
requirements/core.txt
requirements/tests/base.txt
requirements/tests/pydantic-*.txt
.env.local
3 changes: 3 additions & 0 deletions .github/workflows/data/clickhouse/matrix.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
min: &min
spark-version: 2.3.1
pydantic-version: 1
python-version: '3.7'
java-version: 8
os: ubuntu-latest

max: &max
spark-version: 3.5.0
pydantic-version: 2
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
pydantic-version: latest
python-version: '3.12'
java-version: 20
os: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/data/core/matrix.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
min: &min
spark-version: 2.3.1
pydantic-version: 1
python-version: '3.7'
java-version: 8
os: ubuntu-latest

max: &max
spark-version: 3.5.0
pydantic-version: 2
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
pydantic-version: latest
python-version: '3.12'
java-version: 20
os: ubuntu-latest
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/data/ftp/matrix.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
min: &min
pydantic-version: 1
python-version: '3.7'
os: ubuntu-latest

max: &max
pydantic-version: 2
python-version: '3.12'
os: ubuntu-latest

latest: &latest
pydantic-version: latest
python-version: '3.12'
os: ubuntu-latest

Expand All @@ -11,9 +18,13 @@ matrix:
# chonjay21/ftps image has only latest tag
- ftp-version: latest
<<: *max
full: &full
full:
- ftp-version: latest
<<: *min
- ftp-version: latest
<<: *max
nightly: *full
nightly:
- ftp-version: latest
<<: *min
- ftp-version: latest
<<: *latest
15 changes: 13 additions & 2 deletions .github/workflows/data/ftps/matrix.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
min: &min
pydantic-version: 1
python-version: '3.7'
os: ubuntu-latest

max: &max
pydantic-version: 2
python-version: '3.12'
os: ubuntu-latest

latest: &latest
pydantic-version: latest
python-version: '3.12'
os: ubuntu-latest

Expand All @@ -11,9 +18,13 @@ matrix:
# chonjay21/ftps image has only latest tag
- ftps-version: latest
<<: *max
full: &full
full:
- ftps-version: latest
<<: *min
- ftps-version: latest
<<: *max
nightly: *full
nightly:
- ftps-version: latest
<<: *min
- ftps-version: latest
<<: *latest
23 changes: 21 additions & 2 deletions .github/workflows/data/greenplum/matrix.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,43 @@
min: &min
# Spark 2.3.0 does not support passing ivysettings.xml
spark-version: 2.3.1
pydantic-version: 1
python-version: '3.7'
java-version: 8
os: ubuntu-latest

max: &max
# Greenplum connector does not support Spark 3.3+
spark-version: 3.2.4
pydantic-version: 2
python-version: '3.10'
java-version: 11
os: ubuntu-latest

latest: &latest
# Greenplum connector does not support Spark 3.3+
spark-version: 3.2.4
pydantic-version: latest
python-version: '3.10'
java-version: 11
os: ubuntu-latest

matrix:
small:
- greenplum-version: 7.0.0
package-version: 2.3.1
<<: *max
full: &full
full:
- greenplum-version: 6.25.3
package-version: 2.2.0
<<: *min
- greenplum-version: 7.0.0
package-version: 2.3.1
<<: *max
nightly: *full
nightly:
- greenplum-version: 6.25.3
package-version: 2.2.0
<<: *min
- greenplum-version: 7.0.0
package-version: 2.3.1
<<: *latest
3 changes: 3 additions & 0 deletions .github/workflows/data/hdfs/matrix.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
min: &min
hadoop-version: hadoop2-hdfs
spark-version: 2.3.1
pydantic-version: 1
python-version: '3.7'
java-version: 8
os: ubuntu-latest

max: &max
hadoop-version: hadoop3-hdfs
spark-version: 3.5.0
pydantic-version: 2
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
hadoop-version: hadoop3-hdfs
spark-version: latest
pydantic-version: latest
python-version: '3.12'
java-version: 20
os: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/data/hive/matrix.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
min: &min
spark-version: 2.3.1
pydantic-version: 1
python-version: '3.7'
java-version: 8
os: ubuntu-latest

max: &max
spark-version: 3.5.0
pydantic-version: 2
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
pydantic-version: latest
python-version: '3.12'
java-version: 20
os: ubuntu-latest
Expand Down
Loading

0 comments on commit c9b54df

Please sign in to comment.