Skip to content

Commit 4444bb5

Browse files
authored
Use astral-sh/ruff-action@v2 (#309)
1 parent 06164f8 commit 4444bb5

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

Diff for: .github/workflows/lint-and-build.yml

+10-16
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,20 @@ concurrency:
4040

4141
jobs:
4242
ruff:
43-
runs-on: ${{ matrix.os }}
44-
strategy:
45-
fail-fast: false
46-
# Ruff is version and platform sensible
47-
matrix:
48-
os: [windows-latest, ubuntu-22.04]
49-
python-version: ["3.11", "3.12", "3.13"]
43+
runs-on: ubuntu-22.04
5044
steps:
5145
- name: Checkout ${{ github.repository }}/${{ github.ref }}
5246
uses: actions/checkout@v4
53-
- name: Set up Python ${{ matrix.python-version }}
54-
uses: actions/setup-python@v5
55-
with:
56-
python-version: ${{ matrix.python-version }}
57-
cache: "pip"
58-
cache-dependency-path: "scripts/requirements*.txt"
59-
- run: scripts/install.ps1
47+
- name: Get Ruff version
48+
id: ruff_version
49+
run: |
50+
$Env:RUFF_VERSION=Select-String -path scripts/requirements-dev.txt -pattern 'ruff ?([=<>~]?= ?[\d\.]+)' | %{ $_.Matches[0].Groups[1].Value }
51+
echo $Env:RUFF_VERSION
52+
echo "RUFF_VERSION=$Env:RUFF_VERSION" >> $Env:GITHUB_OUTPUT
6053
shell: pwsh
61-
- run: ruff check .
54+
- uses: astral-sh/ruff-action@v2
55+
with:
56+
version: ${{ steps.ruff_version.outputs.RUFF_VERSION }}
6257
Pyright:
6358
runs-on: ${{ matrix.os }}
6459
strategy:
@@ -89,7 +84,6 @@ jobs:
8984
uses: jakebailey/pyright-action@v2
9085
with:
9186
version: ${{ steps.pyright_version.outputs.PYRIGHT_VERSION }}
92-
extra-args: --threads
9387
working-directory: src/
9488
python-version: ${{ matrix.python-version }}
9589
Build:

Diff for: scripts/requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
-r requirements.txt
1313
#
1414
# Linters & Formatters
15-
ruff>=0.8.0 # Pre-commit fix # Must match .pre-commit-config.yaml
15+
ruff>=0.8.0
1616
#
1717
# Types
1818
scipy-stubs>=1.14.1.1

Diff for: scripts/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ psutil>=6.0.0 # Python 3.13 support
1212
# PyAutoGUI # See install.ps1
1313
PyWinCtl>=0.0.42 # py.typed
1414
# When needed, dev builds can be found at https://download.qt.io/snapshots/ci/pyside/dev?C=M;O=D
15-
PySide6-Essentials>=6.8.0.2 # Python 3.13 support
15+
PySide6-Essentials<6.8.1 # Has typing issue with QMessageBox.warning https://bugreports.qt.io/browse/PYSIDE-2939
1616
scipy>=1.14.1 # Python 3.13 support
1717
tomli-w>=1.1.0 # Typing fixes
1818
typing-extensions>=4.4.0 # @override decorator support

0 commit comments

Comments
 (0)