Updated Ruff and Pyright (#321)

Avasam · pre-commit-ci[bot] · web-flow · commit 4b89497578d8 · 2025-05-02T18:33:33.000-04:00
Co-authored-by: pre-commit-ci[bot] &lt;66853113+pre-commit-ci[bot]@users.noreply.github.com&gt;
diff --git a/.github/workflows/lint-and-build.yml b/.github/workflows/lint-and-build.yml
@@ -43,7 +43,10 @@ jobs:
       - uses: astral-sh/ruff-action@v3
         with:
           version-file: "pyproject.toml"
-      - run: ruff format --check
+      - run: ruff format --check --diff
+        # Show formatting issues even if the "check" step failed
+        if: ${{ !cancelled() }}
+
   Pyright:
     runs-on: ${{ matrix.os }}
     strategy:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
       - id: pretty-format-ini
         args: [--autofix]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.6 # Must match requirements-dev.txt
+    rev: v0.11.8 # Must match requirements-dev.txt
     hooks:
       - id: ruff
         args: [--fix]
diff --git a/README.md b/README.md
@@ -100,10 +100,7 @@ Not a developer? You can still help through the following methods:
   - <https://bugreports.qt.io/browse/PYSIDE-2541>
   - <https://bugreports.qt.io/browse/PYSIDE-2542>
   - <https://github.com/pyinstaller/pyinstaller/issues/9012>
-  - <https://github.com/astral-sh/uv/issues/1495>
   - <https://github.com/opencv/opencv/issues?q=is%3Aissue+is%3Aopen+involves%3AAvasam+sort%3Areactions-%2B1-asc+>
-  - <https://github.com/opencv/opencv/issues/18305>
-  - <https://github.com/opencv/opencv/issues/23906>
   - <https://github.com/mypyc/mypyc/issues?q=sort%3Areactions-%2B1%20is%3Aissue%20is%3Aopen%20%20involves%3AAvasam%20>
   - <https://github.com/uiri/toml/issues/270>
   - <https://github.com/microsoft/vscode/issues/40239>
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ dependencies = [
   "typed-D3DShot[numpy] >=1.0.1; sys_platform == 'win32'",
   "winrt-Windows.Foundation >=2.2.0; sys_platform == 'win32'", # Python 3.13 support
   "winrt-Windows.Graphics >=2.2.0; sys_platform == 'win32'", # Python 3.13 support
-  "winrt-Windows.Graphics.Capture >=2.3.0; sys_platform == 'win32'", # Python 3.13 support
+  "winrt-Windows.Graphics.Capture >=3.0.0; sys_platform == 'win32'", # Type hints are no longer typing.Optional by default.
   "winrt-Windows.Graphics.Capture.Interop >=2.3.0; sys_platform == 'win32'", # Python 3.13 support
   "winrt-Windows.Graphics.DirectX >=2.3.0; sys_platform == 'win32'", # Python 3.13 support
   "winrt-Windows.Graphics.DirectX.Direct3D11 >=2.3.0; sys_platform == 'win32'", # Python 3.13 support
@@ -51,8 +51,8 @@ dev = [
   #
   # Linters & Formatters
   "mypy[faster-cache] >=1.14",
-  "pyright[nodejs] >=1.1",
-  "ruff >=0.9.6",
+  "pyright[nodejs] >=1.1.400", # reportPrivateImportUsage behaviour change
+  "ruff >=0.11.8",
   #
   # Types
   "scipy-stubs >=1.14.1.1",
@@ -110,6 +110,8 @@ reportUnusedCallResult = "none"
 
 # Exclude from scanning when running pyright
 exclude = [
+  ".git/", # Avoid accidentally scanning branch names ending in .py
+  ".venv*/",
   ".venv/",
   # Auto generated, fails some strict pyright checks
   "build/",
diff --git a/ruff.toml b/ruff.toml
@@ -6,10 +6,9 @@
 # Modifications to this file that are not project-specific should also be done upstream.
 
 # https://docs.astral.sh/ruff/configuration/
-target-version = "py311" # Change this to the oldest supported version by your application
 line-length = 100
 preview = true
-required-version = ">=0.9.0" # Removed ISC compatibility warning
+required-version = ">=0.11.0" # tool.ruff.target-version is infered from project.requires-python
 
 [format]
 docstring-code-format = true
@@ -24,7 +23,6 @@ ignore = [
   "D1", # pydocstyle Missing doctring
   "D401", # pydocstyle: non-imperative-mood
   "EM", # flake8-errmsg
-  "EXE", # flake8-executable
   # This is often something we can't control: https://github.com/astral-sh/ruff/issues/9497
   # Also false-positive with positional-only arguments: https://github.com/astral-sh/ruff/issues/3247
   "FBT003", # flake8-boolean-trap: boolean-positional-value-in-call
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -1,3 +1,5 @@
+#! /usr/bin/pwsh
+
 & "$PSScriptRoot/compile_resources.ps1"
 
 $SupportsSplashScreen = [System.Convert]::ToBoolean($(uv run --active python -c "import _tkinter; print(hasattr(_tkinter, '__file__'))"))
diff --git a/scripts/compile_resources.ps1 b/scripts/compile_resources.ps1
@@ -1,3 +1,5 @@
+#! /usr/bin/pwsh
+
 $originalDirectory = $pwd
 Set-Location "$PSScriptRoot/.."
 
diff --git a/scripts/designer.ps1 b/scripts/designer.ps1
@@ -1,3 +1,5 @@
+#! /usr/bin/pwsh
+
 $qt6_applications_path = uv run --active python -c 'import qt6_applications; print(qt6_applications.__path__[0])'
 
 & "$qt6_applications_path/Qt/bin/designer" `
diff --git a/scripts/install.ps1 b/scripts/install.ps1
@@ -1,3 +1,5 @@
+#! /usr/bin/pwsh
+
 # Validating user groups on Linux
 If ($IsLinux) {
   $groups = groups
diff --git a/scripts/lint.ps1 b/scripts/lint.ps1
@@ -1,3 +1,5 @@
+#! /usr/bin/pwsh
+
 $originalDirectory = $pwd
 Set-Location "$PSScriptRoot/.."
 $exitCodes = 0
diff --git a/scripts/start.ps1 b/scripts/start.ps1
@@ -1,3 +1,5 @@
+#! /usr/bin/pwsh
+
 param ([string]$p1)
 & "$PSScriptRoot/compile_resources.ps1"
 uv run --active "$PSScriptRoot/../src/AutoSplit.py" $p1
diff --git a/src/capture_method/WindowsGraphicsCaptureMethod.py b/src/capture_method/WindowsGraphicsCaptureMethod.py
@@ -29,7 +29,7 @@
 WGC_NO_BORDER_MIN_BUILD = 20348
 
 
-async def convert_d3d_surface_to_software_bitmap(surface: IDirect3DSurface | None):
+async def convert_d3d_surface_to_software_bitmap(surface: IDirect3DSurface):
     return await SoftwareBitmap.create_copy_from_surface_async(surface)
 
 
diff --git a/src/utils.py b/src/utils.py
@@ -293,7 +293,7 @@ def run_tesseract(png: bytes):
     @return: The recognized output string from tesseract.
     """
     return (
-        subprocess.Popen(  # noqa: S603 # Only using known literal strings
+        subprocess.Popen(  # noqa: S603 # Only using known literal strings or shutil.which result
             TESSERACT_CMD, **subprocess_kwargs()
         )
         .communicate(input=png)[0]
@@ -306,7 +306,7 @@ def list_processes():
         return [
             # The first row is the process name
             line.split()[0]
-            for line in subprocess.check_output(  # noqa: S603 # Known input
+            for line in subprocess.check_output(
                 "C:/Windows/System32/tasklist.exe", text=True
             ).splitlines()[3:]  # Skip the table header lines
             if line
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#! /usr/bin/pwsh`
	`2`	`+`
`1`	`3`	`& "$PSScriptRoot/compile_resources.ps1"`
`2`	`4`
`3`	`5`	`$SupportsSplashScreen = [System.Convert]::ToBoolean($(uv run --active python -c "import _tkinter; print(hasattr(_tkinter, '__file__'))"))`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#! /usr/bin/pwsh`
	`2`	`+`
`1`	`3`	`$originalDirectory = $pwd`
`2`	`4`	`Set-Location "$PSScriptRoot/.."`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#! /usr/bin/pwsh`
	`2`	`+`
`1`	`3`	`$qt6_applications_path = uv run --active python -c 'import qt6_applications; print(qt6_applications.__path__[0])'`
`2`	`4`
`3`	`5`	& "$qt6_applications_path/Qt/bin/designer" `
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#! /usr/bin/pwsh`
	`2`	`+`
`1`	`3`	`# Validating user groups on Linux`
`2`	`4`	`If ($IsLinux) {`
`3`	`5`	`$groups = groups`