clean up

Author: blink1073

.github/workflows/test.yml

@@ -15,11 +15,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.7, 3.8, 3.9, 3.10-dev, pypy-3.7]
+        python-version: [3.7, 3.8, 3.9, 3.10, pypy-3.7]
         exclude:
           # pywin32 not available
           - os: windows-latest
-            python-version: 3.10-dev
+            python-version: 3.10
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -51,3 +51,23 @@ jobs:
         run: |
           pip install check-manifest
           check-manifest -v
+
+  pre-commit:
+    name: pre-commit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: pre-commit/[email protected]
+        with:
+          extra_args: --all-files --hook-stage=manual
+      - name: Help message if pre-commit fail
+        if: ${{ failure() }}
+        run: |
+          echo "You can install pre-commit hooks to automatically run formatting"
+          echo "on each commit with:"
+          echo "    pre-commit install"
+          echo "or you can run by hand on staged files with"
+          echo "    pre-commit run"
+          echo "or after-the-fact on already committed files with"
+          echo "    pre-commit run --all-files --hook-stage=manual"

.pre-commit-config.yaml

@@ -1,6 +1,3 @@
-ci:
-  skip: [check-jsonschema]
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.1.0
@@ -47,6 +44,7 @@ repos:
     hooks:
       - id: doc8
         args: [--max-line-length=200]
+        stages: [manual]
 
   - repo: https://github.com/pycqa/flake8
     rev: 4.0.1
@@ -58,11 +56,16 @@ repos:
             "flake8-logging-format==0.6.0",
             "flake8-implicit-str-concat==0.2.0",
           ]
+        stages: [manual]
+
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.942
     hooks:
       - id: mypy
+        args: ["--config-file", "pyproject.toml"]
+        stages: [manual]
+        additional_dependencies: [pytest]
         exclude: |
           exclude: |
             (?x)^(
@@ -78,3 +81,4 @@ repos:
         files: ^\.github/workflows/
         types: [yaml]
         args: ["--schemafile", "https://json.schemastore.org/github-workflow"]
+        stages: [manual]

jupyter_core/paths.py

@@ -430,12 +430,12 @@ def win32_restrict_file_to_user(fname):
         The path to the file to secure
     """
     try:
-        import win32api
+        import win32api  # type:ignore[import]
     except ImportError:
         return _win32_restrict_file_to_user_ctypes(fname)
 
-    import ntsecuritycon as con
-    import win32security
+    import ntsecuritycon as con  # type:ignore[import]
+    import win32security  # type:ignore[import]
 
     # everyone, _domain, _type = win32security.LookupAccountName("", "Everyone")
     admins = win32security.CreateWellKnownSid(win32security.WinBuiltinAdministratorsSid)

pyproject.toml

@@ -4,12 +4,26 @@ build-backend = "setuptools.build_meta"
 
 [tool.mypy]
 check_untyped_defs = true
+disallow_any_generics = false
 disallow_incomplete_defs = true
+disallow_untyped_decorators = true
 no_implicit_optional = true
+no_implicit_reexport = false
 pretty = true
 show_error_context = true
 show_error_codes = true
 strict_equality = true
+strict_optional = true
 warn_unused_configs = true
-warn_unused_ignores = true
 warn_redundant_casts = true
+warn_return_any = false
+warn_unused_ignores = true
+
+[[tool.mypy.overrides]]
+module = [
+    "traitlets.*",
+    "jupyter_core.*",
+    "ipykernel",
+    "entrypoints"
+]
+ignore_missing_imports = true

setup.py

@@ -4,8 +4,8 @@
 # Distributed under the terms of the Modified BSD License.
 import sys
 
-from setuptools import setup
-from setuptools.command.bdist_egg import bdist_egg
+from setuptools import setup  # type:ignore[import]
+from setuptools.command.bdist_egg import bdist_egg  # type:ignore[import]
 
 
 class bdist_egg_disabled(bdist_egg):