Add pre-commit hooks for autofixing trailing whitespace (#15237)

AlexWaygood · pre-commit-ci[bot] · web-flow · commit 449052583986 · 2023-05-13T21:35:51.000-07:00
Co-authored-by: pre-commit-ci[bot] &lt;66853113+pre-commit-ci[bot]@users.noreply.github.com&gt;
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,2 @@
 # Adopt black and isort
-97c5ee99bc98dc475512e549b252b23a6e7e0997
+97c5ee99bc98dc475512e549b252b23a6e7e0997
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,10 @@
+exclude: '^(mypyc/external/)|(mypy/typeshed/)'  # Exclude all vendored code from lints
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0  # must match test-requirements.txt
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
   - repo: https://github.com/psf/black
     rev: 23.3.0  # must match test-requirements.txt
     hooks:
diff --git a/mypyc/lib-rt/bytes_ops.c b/mypyc/lib-rt/bytes_ops.c
@@ -6,7 +6,7 @@
 #include "CPy.h"
 
 // Returns -1 on error, 0 on inequality, 1 on equality.
-// 
+//
 // Falls back to PyObject_RichCompareBool.
 int CPyBytes_Compare(PyObject *left, PyObject *right) {
     if (PyBytes_CheckExact(left) && PyBytes_CheckExact(right)) {
diff --git a/mypyc/test-data/irbuild-dict.test b/mypyc/test-data/irbuild-dict.test
@@ -583,4 +583,3 @@ L2:
 L3:
     r7 = box(None, 1)
     return r7
-
diff --git a/mypyc/test-data/irbuild-nested.test b/mypyc/test-data/irbuild-nested.test
@@ -859,4 +859,3 @@ L2:
     r2 = baz(r1)
     r3 = CPyTagged_Add(n, r2)
     return r3
-
diff --git a/mypyc/test-data/irbuild-set.test b/mypyc/test-data/irbuild-set.test
@@ -836,4 +836,3 @@ L4:
     r11 = CPy_NoErrOccured()
 L5:
     return 1
-
diff --git a/mypyc/test-data/irbuild-strip-asserts.test b/mypyc/test-data/irbuild-strip-asserts.test
@@ -10,4 +10,3 @@ L0:
     r0 = object 3
     x = r0
     return x
-
diff --git a/mypyc/test-data/run-bools.test b/mypyc/test-data/run-bools.test
@@ -226,4 +226,4 @@ def test_mixed_comparisons_i64() -> None:
 y = False
 print((y or 0) and True)
 [out]
-0
+0
diff --git a/test-data/packages/modulefinder-site-packages/foo-stubs/bar.pyi b/test-data/packages/modulefinder-site-packages/foo-stubs/bar.pyi
@@ -1 +1 @@
-bar_var: str
+bar_var: str
diff --git a/test-data/packages/modulefinder-site-packages/foo/bar.py b/test-data/packages/modulefinder-site-packages/foo/bar.py
@@ -1 +1 @@
-bar_var = "bar"
+bar_var = "bar"
diff --git a/test-data/packages/modulefinder-site-packages/ns_pkg_typed/a.py b/test-data/packages/modulefinder-site-packages/ns_pkg_typed/a.py
@@ -1 +1 @@
-a_var = "a"
+a_var = "a"
diff --git a/test-data/packages/modulefinder-site-packages/ns_pkg_typed/b/c.py b/test-data/packages/modulefinder-site-packages/ns_pkg_typed/b/c.py
@@ -1 +1 @@
-c_var = "c"
+c_var = "c"
diff --git a/test-data/packages/modulefinder-site-packages/ns_pkg_untyped/a.py b/test-data/packages/modulefinder-site-packages/ns_pkg_untyped/a.py
@@ -1 +1 @@
-a_var = "a"
+a_var = "a"
diff --git a/test-data/packages/modulefinder-site-packages/ns_pkg_untyped/b/c.py b/test-data/packages/modulefinder-site-packages/ns_pkg_untyped/b/c.py
@@ -1 +1 @@
-c_var = "c"
+c_var = "c"
diff --git a/test-data/packages/modulefinder-site-packages/pkg_typed/__init__.py b/test-data/packages/modulefinder-site-packages/pkg_typed/__init__.py
@@ -1 +1 @@
-pkg_typed_var = "pkg_typed"
+pkg_typed_var = "pkg_typed"
diff --git a/test-data/packages/modulefinder-site-packages/pkg_typed/a.py b/test-data/packages/modulefinder-site-packages/pkg_typed/a.py
@@ -1 +1 @@
-a_var = "a"
+a_var = "a"
diff --git a/test-data/packages/modulefinder-site-packages/pkg_typed/b/__init__.py b/test-data/packages/modulefinder-site-packages/pkg_typed/b/__init__.py
@@ -1 +1 @@
-b_var = "b"
+b_var = "b"
diff --git a/test-data/packages/modulefinder-site-packages/pkg_typed/b/c.py b/test-data/packages/modulefinder-site-packages/pkg_typed/b/c.py
@@ -1 +1 @@
-c_var = "c"
+c_var = "c"
diff --git a/test-data/packages/modulefinder-site-packages/pkg_untyped/__init__.py b/test-data/packages/modulefinder-site-packages/pkg_untyped/__init__.py
@@ -1 +1 @@
-pkg_untyped_var = "pkg_untyped"
+pkg_untyped_var = "pkg_untyped"
diff --git a/test-data/packages/modulefinder-site-packages/pkg_untyped/a.py b/test-data/packages/modulefinder-site-packages/pkg_untyped/a.py
@@ -1 +1 @@
-a_var = "a"
+a_var = "a"
diff --git a/test-data/packages/modulefinder-site-packages/pkg_untyped/b/__init__.py b/test-data/packages/modulefinder-site-packages/pkg_untyped/b/__init__.py
@@ -1 +1 @@
-b_var = "b"
+b_var = "b"
diff --git a/test-data/packages/modulefinder-site-packages/pkg_untyped/b/c.py b/test-data/packages/modulefinder-site-packages/pkg_untyped/b/c.py
@@ -1 +1 @@
-c_var = "c"
+c_var = "c"
diff --git a/test-data/packages/modulefinder-site-packages/standalone.py b/test-data/packages/modulefinder-site-packages/standalone.py
@@ -1 +1 @@
-standalone_var = "standalone"
+standalone_var = "standalone"
diff --git a/test-data/pybind11_mypy_demo/pyproject.toml b/test-data/pybind11_mypy_demo/pyproject.toml
@@ -7,4 +7,4 @@ requires = [
     "pybind11==2.9.2",
 ]
 
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"
diff --git a/test-data/pybind11_mypy_demo/src/main.cpp b/test-data/pybind11_mypy_demo/src/main.cpp
@@ -167,4 +167,4 @@ void bind_basics(py::module& basics) {
 PYBIND11_MODULE(pybind11_mypy_demo, m) {
   auto basics = m.def_submodule("basics");
   bind_basics(basics);
-}
+}
diff --git a/test-data/unit/check-assert-type-fail.test b/test-data/unit/check-assert-type-fail.test
@@ -25,4 +25,4 @@ class array:
         i = 1
 def f(si: arr.array[int]):
     typing.assert_type(si, int) # E: Expression is of type "array[int]", not "int"
-[builtins fixtures/tuple.pyi]
+[builtins fixtures/tuple.pyi]
diff --git a/test-data/unit/check-python39.test b/test-data/unit/check-python39.test
@@ -25,4 +25,3 @@ a = b = c = [1, 2, 3]
 for x in *a, *b, *c:
     reveal_type(x)  # N: Revealed type is "builtins.int"
 [builtins fixtures/tuple.pyi]
-
diff --git a/test-data/unit/check-singledispatch.test b/test-data/unit/check-singledispatch.test
@@ -71,7 +71,7 @@ def g(arg: int) -> None:
 from functools import singledispatch
 
 @singledispatch
-def f(arg) -> None: 
+def f(arg) -> None:
     pass
 
 @f.register(str)
diff --git a/test-data/unit/envvars.test b/test-data/unit/envvars.test
@@ -8,4 +8,3 @@ BAR = 0  # type: int
 [file subdir/mypy.ini]
 \[mypy]
 files=$MYPY_CONFIG_FILE_DIR/good.py
-
diff --git a/test-data/unit/pep561.test b/test-data/unit/pep561.test
@@ -222,4 +222,4 @@ from typedpkg_ns.a.bbb import bf
 -- dummy should trigger a second iteration
 [file dummy.py.2]
 [out]
-[out2]
+[out2]
diff --git a/test-data/unit/plugins/fully_qualified_test_hook.py b/test-data/unit/plugins/fully_qualified_test_hook.py
@@ -6,7 +6,7 @@ def get_method_signature_hook(self, fullname):
         if 'FullyQualifiedTest' in fullname:
             assert fullname.startswith('__main__.') and not ' of ' in fullname, fullname
             return my_hook
-    
+
         return None
 
 def my_hook(ctx: MethodSigContext) -> CallableType:
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -9,6 +9,7 @@ flake8-noqa==1.3.1; python_version >= "3.8"      # must match version in .pre-co
 isort[colors]==5.12.0; python_version >= "3.8"   # must match version in .pre-commit-config.yaml
 lxml>=4.9.1; (python_version<'3.11' or sys_platform!='win32') and python_version<'3.12'
 pre-commit
+pre-commit-hooks==4.4.0
 psutil>=4.0
 # pytest 6.2.3 does not support Python 3.10
 pytest>=6.2.4

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Adopt black and isort`
`2`		`-97c5ee99bc98dc475512e549b252b23a6e7e0997`
	`2`	`+97c5ee99bc98dc475512e549b252b23a6e7e0997`