Skip to content

Commit 1719ade

Browse files
authored
Merge pull request #292 from per1234/pyproject_toml-version-file
Use `pyproject.toml` as Python version source
2 parents abab3f2 + b976f94 commit 1719ade

7 files changed

+6
-15
lines changed

.github/workflows/check-python-task.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
- "**/poetry.lock"
1212
- "**/pyproject.toml"
1313
- "**/setup.cfg"
14-
- ".python-version"
1514
- "Taskfile.ya?ml"
1615
- "**/tox.ini"
1716
- "**.py"
@@ -22,7 +21,6 @@ on:
2221
- "**/poetry.lock"
2322
- "**/pyproject.toml"
2423
- "**/setup.cfg"
25-
- ".python-version"
2624
- "Taskfile.ya?ml"
2725
- "**/tox.ini"
2826
- "**.py"
@@ -71,7 +69,7 @@ jobs:
7169
- name: Install Python
7270
uses: actions/setup-python@v5
7371
with:
74-
python-version-file: .python-version
72+
python-version-file: pyproject.toml
7573

7674
- name: Install Poetry
7775
run: |
@@ -105,7 +103,7 @@ jobs:
105103
- name: Install Python
106104
uses: actions/setup-python@v5
107105
with:
108-
python-version-file: .python-version
106+
python-version-file: pyproject.toml
109107

110108
- name: Install Poetry
111109
run: |

.github/workflows/check-yaml-task.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
create:
77
push:
88
paths:
9-
- ".python-version"
109
- ".yamllint*"
1110
- "poetry.lock"
1211
- "pyproject.toml"
@@ -23,7 +22,6 @@ on:
2322
- "**.syntax"
2423
pull_request:
2524
paths:
26-
- ".python-version"
2725
- ".yamllint*"
2826
- "poetry.lock"
2927
- "pyproject.toml"
@@ -99,7 +97,7 @@ jobs:
9997
- name: Install Python
10098
uses: actions/setup-python@v5
10199
with:
102-
python-version-file: .python-version
100+
python-version-file: pyproject.toml
103101

104102
- name: Install Poetry
105103
run: |

.github/workflows/spell-check-task.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Install Python
5252
uses: actions/setup-python@v5
5353
with:
54-
python-version-file: .python-version
54+
python-version-file: pyproject.toml
5555

5656
- name: Install Poetry
5757
run: |

.github/workflows/test-integration.yml

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
paths:
88
- ".github/workflows/test-integration.yml"
99
- ".github/workflows/testdata/**"
10-
- ".python-version"
1110
- "poetry.lock"
1211
- "pyproject.toml"
1312
- "action.yml"
@@ -17,7 +16,6 @@ on:
1716
paths:
1817
- ".github/workflows/test-integration.yml"
1918
- ".github/workflows/testdata/**"
20-
- ".python-version"
2119
- "poetry.lock"
2220
- "pyproject.toml"
2321
- "action.yml"

.github/workflows/test-python-poetry-task.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
- "dev/.?codecov.ya?ml"
1212
- ".?codecov.ya?ml"
1313
- "Taskfile.ya?ml"
14-
- ".python-version"
1514
- "poetry.lock"
1615
- "pyproject.toml"
1716
- "compilesketches/tests/**"
@@ -24,7 +23,6 @@ on:
2423
- "dev/.?codecov.ya?ml"
2524
- ".?codecov.ya?ml"
2625
- "Taskfile.ya?ml"
27-
- ".python-version"
2826
- "poetry.lock"
2927
- "pyproject.toml"
3028
- "compilesketches/tests/**"
@@ -75,7 +73,7 @@ jobs:
7573
- name: Install Python
7674
uses: actions/setup-python@v5
7775
with:
78-
python-version-file: .python-version
76+
python-version-file: pyproject.toml
7977

8078
- name: Install Poetry
8179
run: |

.python-version

-1
This file was deleted.

action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ runs:
7676
- name: Install Python
7777
uses: actions/setup-python@v5
7878
with:
79-
python-version-file: ${{ github.action_path }}/.python-version
79+
python-version-file: ${{ github.action_path }}/pyproject.toml
8080

8181
- name: Action setup
8282
shell: bash

0 commit comments

Comments
 (0)