Skip to content

Commit ba410dd

Browse files
committed
Merge branch 'develop'
2 parents 1f9ff71 + 6cfc37e commit ba410dd

File tree

190 files changed

+3073
-1488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+3073
-1488
lines changed

.github/workflows/automerge.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'dependabot[bot]'
1111

12+
permissions:
13+
contents: read
14+
pull-requests: write
15+
1216
steps:
1317
- uses: alexwilson/enable-github-automerge-action@2.0.0
1418
with:
@@ -21,6 +25,10 @@ jobs:
2125
runs-on: ubuntu-latest
2226
if: github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'dependabot[bot]'
2327

28+
permissions:
29+
contents: read
30+
pull-requests: write
31+
2432
steps:
2533
- uses: hmarr/auto-approve-action@v4
2634
with:

.github/workflows/cache-cleanup.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
jobs:
99
cleanup:
1010
runs-on: ubuntu-latest
11+
1112
permissions:
1213
# `actions:write` permission is required to delete caches
1314
# See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
@@ -16,7 +17,7 @@ jobs:
1617

1718
steps:
1819
- name: Check out code
19-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2021

2122
- name: Cleanup cache
2223
run: |

.github/workflows/changelog.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,20 @@ jobs:
1616
check-changelog:
1717
name: Changelog Entry Check
1818
runs-on: ubuntu-latest
19-
timeout-minutes: 10
2019
if: "!contains(github.event.pull_request.labels.*.name, 'ci:skip-changelog') && github.event.pull_request.user.login != 'pre-commit-ci[bot]' && github.event.pull_request.user.login != 'dependabot[bot]'"
20+
21+
permissions:
22+
contents: read
23+
2124
steps:
2225
- name: Checkout code
23-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2427
with:
2528
fetch-depth: 0
2629

2730
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
2831
id: python
29-
uses: actions/setup-python@v5
32+
uses: actions/setup-python@v6
3033
with:
3134
python-version: ${{ env.DEFAULT_PYTHON }}
3235

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@ jobs:
2020
linters:
2121
name: Linters
2222
runs-on: ubuntu-latest
23+
2324
permissions:
2425
actions: read
2526
contents: read
2627
security-events: write
2728

2829
steps:
2930
- name: Checkout repository
30-
uses: actions/checkout@v4
31+
uses: actions/checkout@v5
3132

3233
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
33-
uses: actions/setup-python@v5
34+
uses: actions/setup-python@v6
3435
with:
3536
python-version: ${{ env.DEFAULT_PYTHON }}
3637

@@ -86,10 +87,10 @@ jobs:
8687

8788
steps:
8889
- name: Checkout repository
89-
uses: actions/checkout@v4
90+
uses: actions/checkout@v5
9091

9192
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
92-
uses: actions/setup-python@v5
93+
uses: actions/setup-python@v6
9394
with:
9495
python-version: ${{ env.DEFAULT_PYTHON }}
9596

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
1-
min: &min
1+
3_2_x: &3_2_x
22
# Clickhouse version with proper DateTime > DateTime64 comparison
33
clickhouse-image: yandex/clickhouse-server
44
clickhouse-version: '21.1-alpine'
5-
spark-version: 2.3.1
5+
spark-version: 3.2.4
66
pydantic-version: 1
77
python-version: '3.7'
88
java-version: 8
99
os: ubuntu-22.04
1010

11-
max: &max
11+
3_5_x: &3_5_x
1212
clickhouse-image: clickhouse/clickhouse-server
13-
clickhouse-version: 25.1-alpine
14-
spark-version: 3.5.5
13+
clickhouse-version: 25.8-alpine
14+
spark-version: 3.5.6
1515
pydantic-version: 2
1616
python-version: '3.13'
1717
java-version: 20
1818
os: ubuntu-latest
1919

20+
4_0_x: &4_0_x
21+
clickhouse-image: clickhouse/clickhouse-server
22+
clickhouse-version: 25.8-alpine
23+
spark-version: 4.0.0
24+
pydantic-version: 2
25+
python-version: '3.13'
26+
# https://stackoverflow.com/a/79017758/23601543
27+
java-version: 22
28+
os: ubuntu-latest
29+
2030
latest: &latest
2131
clickhouse-image: clickhouse/clickhouse-server
2232
clickhouse-version: latest-alpine
@@ -27,6 +37,6 @@ latest: &latest
2737
os: ubuntu-latest
2838

2939
matrix:
30-
small: [*max]
31-
full: [*min, *max]
32-
nightly: [*min, *max, *latest]
40+
small: [*3_5_x]
41+
full: [*3_2_x, *3_5_x, *4_0_x]
42+
nightly: [*latest]
Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
1-
min: &min
2-
# Minimal version with ivysettings.xml override support
3-
spark-version: 2.3.1
1+
3_2_x: &3_2_x
2+
spark-version: 3.2.4
43
pydantic-version: 1
54
python-version: '3.7'
65
java-version: 8
76
os: ubuntu-22.04
87

9-
max: &max
10-
spark-version: 3.5.5
8+
3_5_x: &3_5_x
9+
spark-version: 3.5.6
1110
pydantic-version: 2
1211
python-version: '3.13'
1312
java-version: 20
1413
os: ubuntu-latest
1514

15+
4_0_x: &4_0_x
16+
spark-version: 4.0.0
17+
pydantic-version: 2
18+
python-version: '3.13'
19+
# https://stackoverflow.com/a/79017758/23601543
20+
java-version: 22
21+
os: ubuntu-latest
22+
1623
latest: &latest
1724
spark-version: latest
1825
pydantic-version: latest
@@ -21,6 +28,6 @@ latest: &latest
2128
os: ubuntu-latest
2229

2330
matrix:
24-
small: [*max]
25-
full: [*min, *max]
26-
nightly: [*min, *max, *latest]
31+
small: [*3_5_x]
32+
full: [*3_2_x, *3_5_x, *4_0_x]
33+
nightly: [*latest]

.github/workflows/data/greenplum/matrix.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
min: &min
22
greenplum-version: 6.23.1
33
package-version: 2.2.0
4-
# Spark 2.3.0 does not support passing ivysettings.xml
5-
spark-version: 2.3.1
4+
spark-version: 3.2.4
65
pydantic-version: 1
76
python-version: '3.7'
87
java-version: 8
@@ -31,4 +30,4 @@ latest: &latest
3130
matrix:
3231
small: [*max]
3332
full: [*min, *max]
34-
nightly: [*min, *latest]
33+
nightly: [*latest]
Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
1-
min: &min
1+
3_2_x: &3_2_x
22
hadoop-version: hadoop2-hdfs
3-
spark-version: 2.3.1
3+
spark-version: 3.2.4
44
pydantic-version: 1
55
python-version: '3.7'
66
java-version: 8
77
os: ubuntu-22.04
88

9-
max: &max
9+
3_5_x: &3_5_x
1010
hadoop-version: hadoop3-hdfs
11-
spark-version: 3.5.5
11+
spark-version: 3.5.6
1212
pydantic-version: 2
1313
python-version: '3.13'
1414
java-version: 20
1515
os: ubuntu-latest
1616

17+
4_0_x: &4_0_x
18+
hadoop-version: hadoop3-hdfs
19+
spark-version: 4.0.0
20+
pydantic-version: 2
21+
python-version: '3.13'
22+
# https://stackoverflow.com/a/79017758/23601543
23+
java-version: 22
24+
os: ubuntu-latest
25+
1726
latest: &latest
1827
hadoop-version: hadoop3-hdfs
1928
spark-version: latest
@@ -23,6 +32,6 @@ latest: &latest
2332
os: ubuntu-latest
2433

2534
matrix:
26-
small: [*max]
27-
full: [*min, *max]
28-
nightly: [*min, *max, *latest]
35+
small: [*3_5_x]
36+
full: [*3_2_x, *3_5_x, *4_0_x]
37+
nightly: [*latest]
Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1-
min: &min
2-
spark-version: 2.3.1
1+
3_2_x: &3_2_x
2+
spark-version: 3.2.4
33
pydantic-version: 1
44
python-version: '3.7'
55
java-version: 8
66
os: ubuntu-22.04
77

8-
max: &max
9-
spark-version: 3.5.5
8+
3_5_x: &3_5_x
9+
spark-version: 3.5.6
1010
pydantic-version: 2
1111
python-version: '3.13'
1212
java-version: 20
1313
os: ubuntu-latest
1414

15+
4_0_x: &4_0_x
16+
spark-version: 4.0.0
17+
pydantic-version: 2
18+
python-version: '3.13'
19+
# https://stackoverflow.com/a/79017758/23601543
20+
java-version: 22
21+
os: ubuntu-latest
22+
1523
latest: &latest
1624
spark-version: latest
1725
pydantic-version: latest
@@ -20,6 +28,6 @@ latest: &latest
2028
os: ubuntu-latest
2129

2230
matrix:
23-
small: [*max]
24-
full: [*min, *max]
25-
nightly: [*min, *latest]
31+
small: [*3_5_x]
32+
full: [*3_2_x, *3_5_x, *4_0_x]
33+
nightly: [*latest]
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
**/*hive*
22
**/*hive*/**
3+
**/*iceberg*
4+
**/*iceberg*/**

0 commit comments

Comments
 (0)