Skip to content

Commit 5ec5403

Browse files
authored
support Python 3.14 (#278)
1 parent deabc87 commit 5ec5403

File tree

5 files changed

+14
-20
lines changed

5 files changed

+14
-20
lines changed

.github/workflows/build.yaml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v5
1717

18-
- name: Set up Python 3.10
18+
- name: Set up Python 3.14
1919
uses: actions/setup-python@v6
2020
with:
21-
python-version: "3.10"
21+
python-version: "3.14"
2222

2323
- name: Install app certificates
2424
env:
@@ -49,14 +49,7 @@ jobs:
4949

5050
- name: Install dvc requirements
5151
run: |
52-
# available lxml (webdav dependency) wheels are built with an old
53-
# SDK, which breaks osxpkg notarization. Building from scratch
54-
# instead.
55-
pip install ./dvc[all] --no-binary lxml
56-
# https://github.com/iterative/dvc/issues/7949
57-
pip install PyInstaller==6.14.0
58-
# https://github.com/iterative/dvc/issues/9654
59-
pip install flufl-lock==7.1.1
52+
pip install ./dvc[all] -r ./build-requirements.txt
6053
dvc doctor
6154
6255
- name: Build binary
@@ -81,10 +74,10 @@ jobs:
8174
steps:
8275
- uses: actions/checkout@v5
8376

84-
- name: Set up Python 3.10
77+
- name: Set up Python 3.14
8578
uses: actions/setup-python@v6
8679
with:
87-
python-version: "3.10"
80+
python-version: "3.14"
8881

8982
- name: Set up Ruby 2.6
9083
uses: ruby/setup-ruby@v1
@@ -143,10 +136,10 @@ jobs:
143136
steps:
144137
- uses: actions/checkout@v5
145138

146-
- name: Set up Python 3.10
139+
- name: Set up Python 3.14
147140
uses: actions/setup-python@v6
148141
with:
149-
python-version: "3.10"
142+
python-version: "3.14"
150143

151144
- name: Install requirements
152145
run: |
@@ -177,10 +170,10 @@ jobs:
177170
steps:
178171
- uses: actions/checkout@v5
179172

180-
- name: Set up Python 3.10
173+
- name: Set up Python 3.14
181174
uses: actions/setup-python@v6
182175
with:
183-
python-version: "3.10"
176+
python-version: "3.14"
184177

185178
- name: Install requirements
186179
run: pip install awscli
@@ -195,7 +188,7 @@ jobs:
195188
aws-region: us-east-2
196189
role-to-assume: arn:aws:iam::977611293394:role/dvc-public-osxpkg-deployer
197190
- name: Upload to aws
198-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
191+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && startsWith(github.event.head_commit.message, 'updated dvc to') }}
199192
run: python upload.py dvc-*.pkg s3://dvc-packages/osxpkg/
200193

201194
notify:

.github/workflows/update.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
id: create-pr
3131
uses: peter-evans/create-pull-request@v7
3232
with:
33-
commit-message: dvc ${{ steps.latest.outputs.version }}
33+
commit-message: updated dvc to ${{ steps.latest.outputs.version }}
3434
title: dvc ${{ steps.latest.outputs.version }}
3535
# - name: Merge the PR
3636
# if: ${{ steps.update.outputs.changes != '' && github.event_name != 'pull_request'}}

build-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
PyInstaller==6.16.0

build_installer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
lib = install / "lib"
4141
lib.mkdir(parents=True)
42-
shutil.copytree(path / "dist" / "dvc", lib / "dvc")
42+
shutil.copytree(path / "dist" / "dvc", lib / "dvc", symlinks=True)
4343

4444
bash_dir.mkdir(parents=True)
4545
bash_completion = check_output(

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tool.ruff]
2-
target-version = "py39"
2+
target-version = "py314"
33

44
[tool.ruff.lint]
55
extend-select = ["B", "C4", "I", "T10"]

0 commit comments

Comments
 (0)