run ruff format with lint

seanbudd · seanbudd · commit 3bcf1911a989 · 2024-07-03T12:28:32.000+10:00
diff --git a/appveyor/scripts/tests/lintCheck.ps1 b/appveyor/scripts/tests/lintCheck.ps1
@@ -1,5 +1,4 @@
 $lintOutput = (Resolve-Path .\testOutput\lint\)
-$lintOutput = "$lintOutput\PR-lint.xml"
 .\runlint.bat "$lintOutput"
 if ($LastExitCode -ne 0) {
 	Set-AppveyorBuildVariable "testFailExitCode" $LastExitCode
diff --git a/runlint.bat b/runlint.bat
@@ -1,11 +1,16 @@
 @echo off
-rem runlint [<output file>]
-rem Lints the entire repository
+rem runlint [<output dir>]
+rem Lints and formats all python files
 set hereOrig=%~dp0
 set here=%hereOrig%
 if #%hereOrig:~-1%# == #\# set here=%hereOrig:~0,-1%
 set scriptsDir=%here%\venvUtils
 
-if "%1" NEQ "" set ruffArgs=--output-file=%1 --output-format=junit
-call "%scriptsDir%\venvCmd.bat" ruff check --fix %ruffArgs%
+set ruffCheckArgs=
+set ruffFormatArgs=
+if "%1" NEQ "" set ruffCheckArgs=--output-file=%1/PR-lint.xml --output-format=junit
+if "%1" NEQ "" set ruffFormatArgs=--diff > %1/lint-diff.diff
+call "%scriptsDir%\venvCmd.bat" ruff check --fix %ruffCheckArgs%
+if ERRORLEVEL 1 exit /b %ERRORLEVEL%
+call "%scriptsDir%\venvCmd.bat" ruff format %ruffFormatArgs%
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`$lintOutput = (Resolve-Path .\testOutput\lint\)`
`2`		`-$lintOutput = "$lintOutput\PR-lint.xml"`
`3`	`2`	`.\runlint.bat "$lintOutput"`
`4`	`3`	`if ($LastExitCode -ne 0) {`
`5`	`4`	`Set-AppveyorBuildVariable "testFailExitCode" $LastExitCode`