Skip to content

Commit 64a98c4

Browse files
committed
Unpinned ruff for CI + Cleaned up workflow files a little
1 parent 2a2a202 commit 64a98c4

File tree

3 files changed

+22
-32
lines changed

3 files changed

+22
-32
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,25 +34,27 @@ jobs:
3434
- "3.10"
3535
- "3.11"
3636
- "3.12"
37+
- "3.13"
38+
# - "3.14" # 3.14 will fail because of colors, see #72
3739

3840
steps:
39-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v6
4042
- name: Set up Python ${{ matrix.python-version }}
41-
uses: actions/setup-python@v5
43+
uses: actions/setup-python@v6
4244
with:
4345
python-version: ${{ matrix.python-version }}
4446
- name: Check Python version
4547
run: python --version --version
4648
- name: Install dependencies
4749
run: |
4850
python -m pip install --upgrade pip
49-
python -m pip install .[test] pytest-cov
51+
python -m pip install .[test]
5052
- name: Test with pytest
5153
run: >
5254
python -m pytest
5355
-vv
5456
--cov . --cov-append --cov-config pyproject.toml
5557
- name: Upload coverage to Codecov
56-
uses: codecov/codecov-action@v4
58+
uses: codecov/codecov-action@v5
5759
with:
5860
flags: unittests

.github/workflows/lint.yml

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,57 +16,45 @@ env:
1616
FORCE_COLOR: "1"
1717

1818
jobs:
19-
ruff:
19+
lint:
20+
name: "Ruff & MyPy"
2021
runs-on: ubuntu-latest
2122

2223
steps:
23-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2425
- name: Set up Python
25-
uses: actions/setup-python@v5
26+
uses: actions/setup-python@v6
2627
with:
27-
python-version: "3"
28-
- name: Install pip
29-
run: python -m pip install --upgrade pip
30-
31-
- name: Install Ruff
32-
run: python -m pip install "ruff==0.5.2"
28+
python-version: "3.13"
29+
- name: Install dependencies
30+
run: |
31+
python -m pip install --upgrade pip
32+
python -m pip install .[lint]
3333
3434
- name: Lint with Ruff
3535
run: ruff check . --output-format github
3636

3737
- name: Format with Ruff
3838
run: ruff format . --diff
3939

40-
mypy:
41-
runs-on: ubuntu-latest
42-
43-
steps:
44-
- uses: actions/checkout@v4
45-
- name: Set up Python
46-
uses: actions/setup-python@v5
47-
with:
48-
python-version: "3"
49-
- name: Install dependencies
50-
run: |
51-
python -m pip install --upgrade pip
52-
python -m pip install ".[lint,test]"
53-
- name: Type check with mypy
40+
- name: Type check with MyPy
5441
run: mypy
5542

5643
twine:
44+
name: "Check packing with Twine"
5745
runs-on: ubuntu-latest
5846

5947
steps:
60-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v6
6149
- name: Set up Python
62-
uses: actions/setup-python@v5
50+
uses: actions/setup-python@v6
6351
with:
64-
python-version: "3"
52+
python-version: "3.13"
6553
- name: Install dependencies
6654
run: |
6755
python -m pip install --upgrade pip
6856
python -m pip install --upgrade twine build
69-
- name: Lint with twine
57+
- name: Check with twine
7058
run: |
7159
python -m build .
7260
twine check dist/*

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ lint = [
5454
]
5555
test = [
5656
"pytest>=8.0",
57-
"coverage>=6.5",
57+
"pytest-cov",
5858
"lxml>=4.9",
5959
"setuptools>=70.0", # for Cython compilation
6060
"typing_extensions>=4.9", # for typing_extensions.Unpack

0 commit comments

Comments
 (0)