refactor: simplify, better static typing

Author: henryiii

.pre-commit-config.yaml

@@ -30,12 +30,14 @@ repos:
   - id: requirements-txt-fixer
   - id: trailing-whitespace
 
+# Upgrade old Python syntax
 - repo: https://github.com/asottile/pyupgrade
   rev: v2.31.0
   hooks:
   - id: pyupgrade
     args: [--py3-plus]
 
+# Nicely sort includes
 - repo: https://github.com/PyCQA/isort
   rev: 5.10.1
   hooks:
@@ -47,6 +49,7 @@ repos:
   hooks:
   - id: black
 
+# Also code format the docs
 - repo: https://github.com/asottile/blacken-docs
   rev: v1.12.1
   hooks:
@@ -66,12 +69,15 @@ repos:
   hooks:
   - id: pycln
 
+# Checking for common mistakes
 - repo: https://github.com/pre-commit/pygrep-hooks
   rev: v1.9.0
   hooks:
   - id: python-check-blanket-noqa
   - id: python-check-blanket-type-ignore
   - id: python-no-log-warn
+  # Python 3.6
+  # - id: python-use-type-annotations
   - id: rst-backticks
   - id: rst-directive-colons
   - id: rst-inline-touching-normal
@@ -86,6 +92,7 @@ repos:
       - pep8-naming
     exclude: ^(docs/.*|tools/.*)$
 
+# Automatically remove noqa that are not used
 - repo: https://github.com/asottile/yesqa
   rev: v1.3.0
   hooks:
@@ -106,9 +113,9 @@ repos:
   rev: v0.931
   hooks:
   - id: mypy
-    # Running per-file misbehaves a bit, so just run on all files, it's fast
-    pass_filenames: false
-    additional_dependencies: [typed_ast]
+    args: [--show-error-codes]
+    exclude: ^(tests|docs)/
+    additional_dependencies: [nox, rich]
 
 # Checks the manifest for missing files (native support)
 - repo: https://github.com/mgedmin/check-manifest
@@ -119,27 +126,30 @@ repos:
     stages: [manual]
     additional_dependencies: [cmake, ninja]
 
+# Check for spelling
 - repo: https://github.com/codespell-project/codespell
   rev: v2.1.0
   hooks:
   - id: codespell
     exclude: ".supp$"
     args: ["-L", "nd,ot,thist"]
 
+# Check for common shell mistakes
 - repo: https://github.com/shellcheck-py/shellcheck-py
   rev: v0.8.0.4
   hooks:
   - id: shellcheck
 
-# The original pybind11 checks for a few C++ style items
+# Disallow some common capitalization mistakes
 - repo: local
   hooks:
   - id: disallow-caps
     name: Disallow improper capitalization
     language: pygrep
     entry: PyBind|Numpy|Cmake|CCache|PyTest
-    exclude: .pre-commit-config.yaml
+    exclude: ^\.pre-commit-config.yaml$
 
+# The original pybind11 checks for a few C++ style items
 - repo: local
   hooks:
   - id: check-style

MANIFEST.in

@@ -1,6 +1,5 @@
 recursive-include pybind11/include/pybind11 *.h
 recursive-include pybind11 *.py
 recursive-include pybind11 py.typed
-recursive-include pybind11 *.pyi
 include pybind11/share/cmake/pybind11/*.cmake
 include LICENSE README.rst pyproject.toml setup.py setup.cfg

pybind11/__main__.py

@@ -5,8 +5,7 @@
 from .commands import get_cmake_dir, get_include
 
 
-def print_includes():
-    # type: () -> None
+def print_includes() -> None:
     dirs = [
         sysconfig.get_path("include"),
         sysconfig.get_path("platinclude"),
@@ -22,8 +21,7 @@ def print_includes():
     print(" ".join("-I" + d for d in unique_dirs))
 
 
-def main():
-    # type: () -> None
+def main() -> None:
 
     parser = argparse.ArgumentParser()
     parser.add_argument(

pybind11/_version.py

@@ -1,4 +1,7 @@
-def _to_int(s):
+from typing import Union
+
+
+def _to_int(s: str) -> Union[int, str]:
     try:
         return int(s)
     except ValueError:

pybind11/_version.pyi

@@ -3,15 +3,13 @@
 DIR = os.path.abspath(os.path.dirname(__file__))
 
 
-def get_include(user=False):
-    # type: (bool) -> str
+def get_include(user: bool = False) -> str:
     installed_path = os.path.join(DIR, "include")
     source_path = os.path.join(os.path.dirname(DIR), "include")
     return installed_path if os.path.exists(installed_path) else source_path
 
 
-def get_cmake_dir():
-    # type: () -> str
+def get_cmake_dir() -> str:
     cmake_installed_path = os.path.join(DIR, "share", "cmake", "pybind11")
     if os.path.exists(cmake_installed_path):
         return cmake_installed_path