Fix scripts

Avasam · Aug 10, 2023 · cc0f5ae · cc0f5ae
1 parent 94cf50f
commit cc0f5ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -97,8 +97,9 @@ jobs:
       - uses: actions/checkout@v3
       - run: pip install pyupgrade pycln isort
       # Ignore adodbapi until this has been manually ran and merged in adodbapi code
+      # _dbgscript.py is non-UTF8 on purpose, which is not supported
       # TODO: Progressively remove the keep-* flags and add --py38-plus
-      - run: pyupgrade --keep-percent-format --keep-mock --keep-runtime-typing $(git ls-files '**.py*' ':!:adodbapi/*')
+      - run: pyupgrade --keep-percent-format --keep-mock --keep-runtime-typing $(git ls-files '**.py*' ':!:adodbapi/*' ':!:Pythonwin/pywin/test/_dbgscript.py')
       - run: pycln . --config=pycln.toml --check
       - run: isort . --diff --check-only
       - uses: psf/black@stable

diff --git a/format_all.bat b/format_all.bat
@@ -1,6 +1,7 @@
 @echo off
-@REM findstr: Ignore adodbapi until this has been manually ran and merged in adodbapi code
-for /f "delims=" %%F in ('dir /b /s ".\*.py" ^| findstr /v /i "adodbapi"') do (
+@REM Ignore adodbapi until this has been manually ran and merged in adodbapi code
+@REM _dbgscript.py is non-UTF8 on purpose, which is not supported
+for /f "delims=" %%F in ('git ls-files **.py* :!:adodbapi/* :!:Pythonwin/pywin/test/_dbgscript.py') do (
   @REM TODO: Progressively remove the keep-* flags and add --py38-plus
   pyupgrade --keep-percent-format --keep-mock --keep-runtime-typing %%F
 )