Skip to content

Commit 90e274e

Browse files
fix(ci): Consolidate ruff config and fix Linux deps
CI Fixes: - Changed libgl1-mesa-glx to libgl1 (package renamed in Ubuntu) - Removed standalone .ruff.toml (consolidated to pyproject.toml) - Removed invalid ruff rules (UP045, RUF059 not in ruff 0.4.x) - Simplified ruff check command in CI and tox.ini
1 parent c0287a5 commit 90e274e

4 files changed

Lines changed: 18 additions & 79 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: runner.os == 'Linux'
4343
run: |
4444
sudo apt-get update
45-
sudo apt-get install -y libgl1-mesa-glx libglib2.0-0
45+
sudo apt-get install -y libgl1 libglib2.0-0
4646
4747
- name: Install system dependencies (macOS)
4848
if: runner.os == 'macOS'
@@ -64,7 +64,7 @@ jobs:
6464
pip install -e .
6565
6666
- name: Lint with Ruff
67-
run: ruff check . --config=.ruff.toml
67+
run: ruff check .
6868

6969
- name: Check formatting with Black
7070
run: black --check src/ examples/ benchmarks/ stubs/
@@ -143,7 +143,7 @@ jobs:
143143
- name: Install system dependencies
144144
run: |
145145
sudo apt-get update
146-
sudo apt-get install -y libgl1-mesa-glx libglib2.0-0
146+
sudo apt-get install -y libgl1 libglib2.0-0
147147
148148
- name: Install dependencies
149149
run: |

.ruff.toml

Lines changed: 0 additions & 56 deletions
This file was deleted.

pyproject.toml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -172,24 +172,22 @@ select = [
172172

173173
# Global ignores
174174
ignore = [
175-
"D", # Disable all pydocstyle rules
176-
"PLR2004", # Magic numbers (common in tests)
177-
"B006", # Mutable defaults (enable later)
178-
"E501", # Line length (handled by formatter)
175+
"D",
176+
"PLR2004",
177+
"B006",
178+
"E501",
179179
"UP038",
180180
"UP007",
181+
"UP045", # DO NOT force X | None yet
182+
"RUF059", # Allow unused unpacking in demos/examples
181183
"E712",
182-
# Acceptable complexity for domain-specific functions
183-
"PLR0911", # Too many return statements
184-
"PLR0912", # Too many branches
185-
"PLR0913", # Too many arguments (SecurityLimits constructor)
186-
# Configuration management globals are acceptable
187-
"PLW0603", # Global statement usage
188-
# Import organization and placement
189-
"PLC0415", # Import should be at top-level (acceptable for optional deps)
190-
"I001", # Import block formatting (handled by formatter)
191-
# Performance optimizations (acceptable for readability)
192-
"PLR1730", # Replace if with max/min call
184+
"PLR0911",
185+
"PLR0912",
186+
"PLR0913",
187+
"PLW0603",
188+
"PLC0415",
189+
"I001",
190+
"PLR1730",
193191
]
194192

195193
# Directory-specific ignores

tox.ini

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ commands =
1616

1717
[testenv:lint]
1818
deps =
19-
ruff>=0.2.0
19+
ruff>=0.4.0
2020
commands =
21-
ruff check . \
22-
--config=.ruff.toml \
23-
--extend-ignore=UP045 \
24-
--show-fixes
21+
ruff check .
2522

2623
[testenv:mypy]
2724
deps =

0 commit comments

Comments
 (0)