Skip to content

Commit ab3d47d

Browse files
albertedwardsonalbertedwardson
committed
Make all Python version values strings in double quotes for the sake of consistency, due to the interesting relationship of YAML with fractional numbers. Format all workflow files with the `redhat.vscode-yaml
⁣` VS Code extension. I believe it can be done with CLI or in a pre-commit hook or in a tox step; it needs investigation.
1 parent 6e349ce commit ab3d47d

File tree

5 files changed

+93
-78
lines changed

5 files changed

+93
-78
lines changed

‎.github/workflows/checks.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@ on:
1010

1111
jobs:
1212
build:
13-
1413
runs-on: ubuntu-latest
14+
1515
strategy:
1616
fail-fast: false
1717
matrix:
1818
include:
19-
- python-version: "3.13" # Keep in sync with .readthedocs.yml
20-
env:
21-
TOXENV: docs
22-
- python-version: "3.13"
23-
env:
24-
TOXENV: pre-commit
25-
- python-version: "3.13"
26-
env:
27-
TOXENV: pylint
28-
- python-version: "3.13"
29-
env:
30-
TOXENV: typing
31-
- python-version: "3.13"
32-
env:
33-
TOXENV: twinecheck
19+
- python-version: "3.13" # Keep in sync with .readthedocs.yml
20+
env:
21+
TOXENV: docs
22+
- python-version: "3.13"
23+
env:
24+
TOXENV: pre-commit
25+
- python-version: "3.13"
26+
env:
27+
TOXENV: pylint
28+
- python-version: "3.13"
29+
env:
30+
TOXENV: typing
31+
- python-version: "3.13"
32+
env:
33+
TOXENV: twinecheck
3434

3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v4
3737

38-
- name: Set up Python ${{ matrix.python-version }}
39-
uses: actions/setup-python@v5
40-
with:
41-
python-version: ${{ matrix.python-version }}
38+
- name: Set up Python ${{ matrix.python-version }}
39+
uses: actions/setup-python@v5
40+
with:
41+
python-version: ${{ matrix.python-version }}
4242

43-
- name: Run check
44-
env: ${{ matrix.env }}
45-
run: |
46-
pip install --upgrade pip
47-
pip install --upgrade tox
48-
tox
43+
- name: Run check
44+
env: ${{ matrix.env }}
45+
run: |
46+
pip install --upgrade pip
47+
pip install --upgrade tox
48+
tox

‎.github/workflows/publish.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v4
1414

15-
- name: Set up Python 3.13
16-
uses: actions/setup-python@v5
17-
with:
18-
python-version: 3.13
15+
- name: Set up Python 3.13
16+
uses: actions/setup-python@v5
17+
with:
18+
python-version: "3.13"
1919

20-
- name: Check Tag
21-
id: check-release-tag
22-
run: |
23-
if [[ ${{ github.event.ref }} =~ ^refs/tags/v[0-9]+[.][0-9]+[.][0-9]+(rc[0-9]+|[.]dev[0-9]+)?$ ]]; then
24-
echo ::set-output name=release_tag::true
25-
fi
20+
- name: Check Tag
21+
id: check-release-tag
22+
run: |
23+
if [[ ${{ github.event.ref }} =~ ^refs/tags/v[0-9]+[.][0-9]+[.][0-9]+(rc[0-9]+|[.]dev[0-9]+)?$ ]]; then
24+
echo ::set-output name=release_tag::true
25+
fi
2626
27-
- name: Publish to PyPI
28-
if: steps.check-release-tag.outputs.release_tag == 'true'
29-
run: |
30-
pip install --upgrade build twine
31-
python -m build
32-
export TWINE_USERNAME=__token__
33-
export TWINE_PASSWORD=${{ secrets.PYPI_TOKEN }}
34-
twine upload dist/*
27+
- name: Publish to PyPI
28+
if: steps.check-release-tag.outputs.release_tag == 'true'
29+
run: |
30+
pip install --upgrade build twine
31+
python -m build
32+
export TWINE_USERNAME=__token__
33+
export TWINE_PASSWORD=${{ secrets.PYPI_TOKEN }}
34+
twine upload dist/*

‎.github/workflows/tests-macos.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
jobs:
1212
tests:
13+
runs-on: ${{ matrix.os }}
1314

1415
strategy:
1516
fail-fast: false
@@ -27,15 +28,13 @@ jobs:
2728
- "pypy3.10"
2829
- "pypy3.11"
2930

30-
runs-on: "${{ matrix.os }}"
31-
3231
steps:
3332
- uses: actions/checkout@v4
3433

35-
- name: "Set up Python ${{ matrix.python-version }}"
34+
- name: Set up Python ${{ matrix.python-version }}
3635
uses: actions/setup-python@v5
3736
with:
38-
python-version: "${{ matrix.python-version }}"
37+
python-version: ${{ matrix.python-version }}
3938

4039
- name: Run tests
4140
run: |

‎.github/workflows/tests-ubuntu.yml‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,34 @@ on:
1010

1111
jobs:
1212
tests:
13-
1413
runs-on: ubuntu-latest
14+
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14.0-rc.1", "pypy3.10", "pypy3.11"]
18+
python-version:
19+
- "3.9"
20+
- "3.10"
21+
- "3.11"
22+
- "3.12"
23+
- "3.13"
24+
- "3.14.0-rc.1"
25+
- "pypy3.10"
26+
- "pypy3.11"
1927

2028
steps:
21-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v4
2230

23-
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v5
25-
with:
26-
python-version: ${{ matrix.python-version }}
31+
- name: Set up Python ${{ matrix.python-version }}
32+
uses: actions/setup-python@v5
33+
with:
34+
python-version: ${{ matrix.python-version }}
2735

28-
- name: Run tests
29-
run: |
30-
pip install --upgrade pip
31-
pip install --upgrade tox
32-
tox -e py
36+
- name: Run tests
37+
run: |
38+
pip install --upgrade pip
39+
pip install --upgrade tox
40+
tox -e py
3341
34-
- name: Upload coverage report
35-
uses: codecov/codecov-action@v5
42+
- name: Upload coverage report
43+
uses: codecov/codecov-action@v5

‎.github/workflows/tests-windows.yml‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,34 @@ on:
1010

1111
jobs:
1212
tests:
13-
1413
runs-on: windows-latest
14+
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14.0-rc.1"]
18+
python-version:
19+
- "3.9"
20+
- "3.10"
21+
- "3.11"
22+
- "3.12"
23+
- "3.13"
24+
- "3.14.0-rc.1"
25+
- "pypy3.10"
26+
- "pypy3.11"
1927

2028
steps:
21-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v4
2230

23-
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v5
25-
with:
26-
python-version: ${{ matrix.python-version }}
31+
- name: Set up Python ${{ matrix.python-version }}
32+
uses: actions/setup-python@v5
33+
with:
34+
python-version: ${{ matrix.python-version }}
2735

28-
- name: Run tests
29-
run: |
30-
pip install --upgrade pip
31-
pip install --upgrade tox
32-
tox -e py
36+
- name: Run tests
37+
run: |
38+
pip install --upgrade pip
39+
pip install --upgrade tox
40+
tox -e py
3341
34-
- name: Upload coverage report
35-
uses: codecov/codecov-action@v5
42+
- name: Upload coverage report
43+
uses: codecov/codecov-action@v5

0 commit comments

Comments
 (0)