Skip to content

Commit 75a2ede

Browse files
committed
Move to pyproject.toml
1 parent b69ba42 commit 75a2ede

Some content is hidden

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

82 files changed

+18048
-1197
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,15 @@ updates:
1313
github-actions:
1414
patterns:
1515
- '*'
16+
- package-ecosystem: uv
17+
directory: /
18+
schedule:
19+
interval: weekly
20+
labels:
21+
- type:dependency
22+
versioning-strategy: lockfile-only
23+
# https://til.simonwillison.net/github/dependabot-python-setup
24+
groups:
25+
python-packages:
26+
patterns:
27+
- '*'

.github/workflows/changelog.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,10 @@ jobs:
3838
with:
3939
activate-environment: "true"
4040
cache-suffix: changelog
41-
cache-dependency-glob: |
42-
requirements/core.txt
43-
requirements/docs.txt
4441

4542
- name: Install dependencies
4643
run: |
47-
uv pip install -r requirements/core.txt -r requirements/docs.txt
44+
uv sync --only-group docs
4845
4946
- name: Check changelog entry exists
5047
run: |

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,10 @@ jobs:
4040
with:
4141
activate-environment: "true"
4242
cache-suffix: codeql
43-
cache-dependency-glob: |
44-
requirements/core.txt
45-
requirements/dev.txt
46-
requirements/ftp.txt
47-
requirements/hdfs.txt
48-
requirements/s3.txt
49-
requirements/sftp.txt
50-
requirements/spark.txt
51-
requirements/webdav.txt
5243

5344
- name: Install dependencies
5445
run: |
55-
uv pip install \
56-
setuptools \
57-
-r requirements/core.txt \
58-
-r requirements/dev.txt \
59-
-r requirements/ftp.txt \
60-
-r requirements/hdfs.txt \
61-
-r requirements/s3.txt \
62-
-r requirements/sftp.txt \
63-
-r requirements/spark.txt \
64-
-r requirements/webdav.txt
65-
46+
uv sync --extra files --extra spark --group dev
6647
uv pip install -U flake8-commas
6748
6849
# Set the `CODEQL-PYTHON` environment variable to the Python executable
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.github/workflows/tests.yml
22
.github/workflows/get-matrix.yml
33
.github/workflows/data/base/**
4-
requirements/core.txt
5-
requirements/tests/base.txt
6-
requirements/tests/pydantic-${{ inputs.pydantic-version }}.txt
4+
pyproject.toml
5+
uv.lock
76
.env.local

.github/workflows/data/clickhouse/matrix.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Clickhouse version with proper DateTime > DateTime64 comparison
33
clickhouse-image: yandex/clickhouse-server
44
clickhouse-version: '21.1-alpine'
5-
spark-version: 3.2.4
5+
spark-version: "3.2"
66
pydantic-version: 1
77
python-version: '3.7'
88
java-version: 8
@@ -11,7 +11,7 @@
1111
3_5_x: &3_5_x
1212
clickhouse-image: clickhouse/clickhouse-server
1313
clickhouse-version: 25.9-alpine
14-
spark-version: 3.5.7
14+
spark-version: "3.5"
1515
pydantic-version: 2
1616
python-version: '3.13'
1717
java-version: 20
@@ -20,23 +20,13 @@
2020
4_0_x: &4_0_x
2121
clickhouse-image: clickhouse/clickhouse-server
2222
clickhouse-version: 25.9-alpine
23-
spark-version: 4.0.1
23+
spark-version: "4.0"
2424
pydantic-version: 2
2525
python-version: '3.13'
2626
# https://stackoverflow.com/a/79017758/23601543
2727
java-version: 22
2828
os: ubuntu-latest
2929

30-
latest: &latest
31-
clickhouse-image: clickhouse/clickhouse-server
32-
clickhouse-version: latest-alpine
33-
spark-version: latest
34-
pydantic-version: latest
35-
python-version: '3.13'
36-
java-version: 20
37-
os: ubuntu-latest
38-
3930
matrix:
4031
small: [*3_5_x]
4132
full: [*3_2_x, *3_5_x, *4_0_x]
42-
nightly: [*latest]
Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,25 @@
11
3_2_x: &3_2_x
2-
spark-version: 3.2.4
2+
spark-version: "3.2"
33
pydantic-version: 1
44
python-version: '3.7'
55
java-version: 8
66
os: ubuntu-22.04
77

88
3_5_x: &3_5_x
9-
spark-version: 3.5.7
9+
spark-version: "3.5"
1010
pydantic-version: 2
1111
python-version: '3.13'
1212
java-version: 20
1313
os: ubuntu-latest
1414

1515
4_0_x: &4_0_x
16-
spark-version: 4.0.1
16+
spark-version: "4.0"
1717
pydantic-version: 2
1818
python-version: '3.13'
1919
# https://stackoverflow.com/a/79017758/23601543
2020
java-version: 22
2121
os: ubuntu-latest
2222

23-
latest: &latest
24-
spark-version: latest
25-
pydantic-version: latest
26-
python-version: '3.13'
27-
java-version: 20
28-
os: ubuntu-latest
29-
3023
matrix:
3124
small: [*3_5_x]
3225
full: [*3_2_x, *3_5_x, *4_0_x]
33-
nightly: [*latest]

.github/workflows/data/ftp/matrix.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ max: &max
88
python-version: '3.13'
99
os: ubuntu-latest
1010

11-
latest: &latest
12-
pydantic-version: latest
13-
python-version: '3.13'
14-
os: ubuntu-latest
15-
1611
matrix:
1712
small:
1813
# chonjay21/ftps image has only latest tag
@@ -23,8 +18,3 @@ matrix:
2318
<<: *min
2419
- ftp-version: latest
2520
<<: *max
26-
nightly:
27-
- ftp-version: latest
28-
<<: *min
29-
- ftp-version: latest
30-
<<: *latest

.github/workflows/data/ftps/matrix.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ max: &max
88
python-version: '3.13'
99
os: ubuntu-latest
1010

11-
latest: &latest
12-
pydantic-version: latest
13-
python-version: '3.13'
14-
os: ubuntu-latest
15-
1611
matrix:
1712
small:
1813
# chonjay21/ftps image has only latest tag
@@ -23,8 +18,3 @@ matrix:
2318
<<: *min
2419
- ftps-version: latest
2520
<<: *max
26-
nightly:
27-
- ftps-version: latest
28-
<<: *min
29-
- ftps-version: latest
30-
<<: *latest
Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
min: &min
22
greenplum-version: 6.23.1
33
package-version: 2.2.0
4-
spark-version: 3.2.4
4+
spark-version: "3.2"
55
pydantic-version: 1
66
python-version: '3.7'
77
java-version: 8
@@ -11,23 +11,12 @@ max: &max
1111
greenplum-version: 7.0.0
1212
package-version: 2.3.1
1313
# Greenplum connector does not support Spark 3.3+
14-
spark-version: 3.2.4
14+
spark-version: "3.2"
1515
pydantic-version: 2
1616
python-version: '3.10'
1717
java-version: 11
1818
os: ubuntu-latest
1919

20-
latest: &latest
21-
greenplum-version: 7.0.0
22-
package-version: 2.3.1
23-
# Greenplum connector does not support Spark 3.3+
24-
spark-version: 3.2.4
25-
pydantic-version: latest
26-
python-version: '3.10'
27-
java-version: 11
28-
os: ubuntu-latest
29-
3020
matrix:
3121
small: [*max]
3222
full: [*min, *max]
33-
nightly: [*latest]
Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
11
3_2_x: &3_2_x
22
hadoop-version: hadoop2-hdfs
3-
spark-version: 3.2.4
3+
spark-version: "3.2"
44
pydantic-version: 1
55
python-version: '3.7'
66
java-version: 8
77
os: ubuntu-22.04
88

99
3_5_x: &3_5_x
1010
hadoop-version: hadoop3-hdfs
11-
spark-version: 3.5.7
11+
spark-version: "3.5"
1212
pydantic-version: 2
1313
python-version: '3.13'
1414
java-version: 20
1515
os: ubuntu-latest
1616

1717
4_0_x: &4_0_x
1818
hadoop-version: hadoop3-hdfs
19-
spark-version: 4.0.1
19+
spark-version: "4.0"
2020
pydantic-version: 2
2121
python-version: '3.13'
2222
# https://stackoverflow.com/a/79017758/23601543
2323
java-version: 22
2424
os: ubuntu-latest
2525

26-
latest: &latest
27-
hadoop-version: hadoop3-hdfs
28-
spark-version: latest
29-
pydantic-version: latest
30-
python-version: '3.13'
31-
java-version: 20
32-
os: ubuntu-latest
33-
3426
matrix:
3527
small: [*3_5_x]
3628
full: [*3_2_x, *3_5_x, *4_0_x]
37-
nightly: [*latest]

0 commit comments

Comments
 (0)