A bunch of pre-commit and CI upgrade. (#412)

* safe ruff fixes

* some unsafe fixes

* Tweak ignored rules

* more unsafe fixes

* more ruff fixes

* Fix all newer issues after pre-commit upgrade

Author: Carreau

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.8", "3.12", "3.13"]
         include:
           - os: windows-latest
             python-version: "3.9"
@@ -41,6 +41,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+      - name: Lint
+        run: |
+          hatch run typing:test
       - name: Test
         run: |
           hatch run cov:test

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-case-conflict
       - id: check-ast
@@ -21,12 +21,12 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.27.4
+    rev: 0.31.2
     hooks:
       - id: check-github-workflows
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.17
+    rev: 0.7.22
     hooks:
       - id: mdformat
         additional_dependencies:
@@ -39,22 +39,22 @@ repos:
         types_or: [yaml, html, json]
 
   - repo: https://github.com/adamchainz/blacken-docs
-    rev: "1.16.0"
+    rev: "1.19.1"
     hooks:
       - id: blacken-docs
         additional_dependencies: [black==23.7.0]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.8.0"
+    rev: "v1.15.0"
     hooks:
       - id: mypy
         files: jupyter_core
         stages: [manual]
-        args: ["--install-types", "--non-interactive"]
-        additional_dependencies: ["traitlets>=5.13", "platformdirs>=3.11"]
+        additional_dependencies:
+          ["traitlets>=5.13", "platformdirs>=3.11", "argcomplete"]
 
   - repo: https://github.com/codespell-project/codespell
-    rev: "v2.2.6"
+    rev: "v2.4.1"
     hooks:
       - id: codespell
         args: ["-L", "re-use"]
@@ -67,7 +67,7 @@ repos:
       - id: rst-inline-touching-normal
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
+    rev: v0.9.7
     hooks:
       - id: ruff
         types_or: [python, jupyter]
@@ -76,7 +76,7 @@ repos:
         types_or: [python, jupyter]
 
   - repo: https://github.com/scientific-python/cookie
-    rev: "2024.01.24"
+    rev: "2025.01.22"
     hooks:
       - id: sp-repo-review
         additional_dependencies: ["repo-review[cli]"]

CHANGELOG.md

@@ -339,7 +339,7 @@ We now make the assumption that if we are running in a virtual environment, we s
 
 #### Migrate to Standard Platform Directories
 
-In version 5, we introduce a `JUPYTER_PLATFORM_DIRS` environment variable to opt in to using more appropriate platform-specific directories.  We raise a deprecation warning if the variable is not set.  In version 6,  `JUPYTER_PLATFORM_DIRS` will be opt-out.  In version 7, we will remove the environment variable checks and old directory logic.
+In version 5, we introduce a `JUPYTER_PLATFORM_DIRS` environment variable to opt in to using more appropriate platform-specific directories. We raise a deprecation warning if the variable is not set. In version 6, `JUPYTER_PLATFORM_DIRS` will be opt-out. In version 7, we will remove the environment variable checks and old directory logic.
 
 #### Drop Support for Python 3.7
 

docs/conf.py

@@ -69,7 +69,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = "%d.%d" % version_info[:2]  # type:ignore[str-format]
+major, minor = version_info[:2]
+version = f"{major}.{minor}"
 # The full version, including alpha/beta/rc tags.
 release = __version__
 

jupyter.py

@@ -1,4 +1,5 @@
 """Launch the root jupyter command"""
+
 from __future__ import annotations
 
 if __name__ == "__main__":

jupyter_core/__main__.py

@@ -1,4 +1,5 @@
 """Launch the root jupyter command"""
+
 from __future__ import annotations
 
 from .command import main

jupyter_core/application.py

@@ -133,6 +133,7 @@ def _config_file_name_default(self) -> str:
 
     def write_default_config(self) -> None:
         """Write our default config to a .py config file"""
+        config_file: str
         if self.config_file:
             config_file = self.config_file
         else:
@@ -142,7 +143,7 @@ def write_default_config(self) -> None:
             answer = ""
 
             def ask() -> str:
-                prompt = "Overwrite %s with default config? [y/N]" % config_file
+                prompt = f"Overwrite {config_file!r} with default config? [y/N]"
                 try:
                     return input(prompt).lower() or "n"
                 except KeyboardInterrupt:
@@ -157,7 +158,7 @@ def ask() -> str:
                 return
 
         config_text = self.generate_config_file()
-        print("Writing default config to: %s" % config_file)
+        print("Writing default config to: {config_file!r}")
         ensure_dir_exists(Path(config_file).parent.resolve(), 0o700)
         with Path.open(Path(config_file), mode="w", encoding="utf-8") as f:
             f.write(config_text)

jupyter_core/command.py

@@ -28,12 +28,13 @@ class JupyterParser(argparse.ArgumentParser):
     """A Jupyter argument parser."""
 
     @property
-    def epilog(self) -> str | None:
+    def epilog(self) -> str:
         """Add subcommands to epilog on request
 
         Avoids searching PATH for subcommands unless help output is requested.
         """
-        return "Available subcommands: %s" % " ".join(list_subcommands())
+        subcommands: str = " ".join(list_subcommands())
+        return f"Available subcommands: {subcommands}"
 
     @epilog.setter
     def epilog(self, x: Any) -> None:
@@ -42,7 +43,7 @@ def epilog(self, x: Any) -> None:
     def argcomplete(self) -> None:
         """Trigger auto-completion, if enabled"""
         try:
-            import argcomplete  # type: ignore[import-not-found]
+            import argcomplete
 
             argcomplete.autocomplete(self)
         except ImportError:
@@ -119,7 +120,8 @@ def _execvp(cmd: str, argv: list[str]) -> None:
         # so rely on shutil.which
         cmd_path = which(cmd)
         if cmd_path is None:
-            raise OSError("%r not found" % cmd, errno.ENOENT)
+            msg = f"{cmd!r} not found"
+            raise OSError(msg, errno.ENOENT)
         p = Popen([cmd_path] + argv[1:])  # noqa: S603
         # Don't raise KeyboardInterrupt in the parent process.
         # Set this after spawning, to avoid subprocess inheriting handler.
@@ -377,7 +379,7 @@ def main() -> None:
 
                 for name in sorted(data):
                     path = data[name]
-                    print("%s:" % name)
+                    print(f"{name}:")
                     for p in path:
                         print("    " + p)
             return

jupyter_core/paths.py

@@ -174,7 +174,7 @@ def jupyter_data_dir() -> str:
 
     if sys.platform == "darwin":
         return str(Path(home, "Library", "Jupyter"))
-    if sys.platform == "win32":
+    if sys.platform == "win32":  # type: ignore[unreachable]
         appdata = os.environ.get("APPDATA", None)
         if appdata:
             return str(Path(appdata, "jupyter").resolve())
@@ -292,18 +292,17 @@ def jupyter_path(*subdirs: str) -> list[str]:
     SYSTEM_CONFIG_PATH = platformdirs.site_config_dir(
         APPNAME, appauthor=False, multipath=True
     ).split(os.pathsep)
+elif os.name == "nt":
+    programdata = os.environ.get("PROGRAMDATA", None)
+    if programdata:
+        SYSTEM_CONFIG_PATH = [str(Path(programdata, "jupyter"))]
+    else:  # PROGRAMDATA is not defined by default on XP.
+        SYSTEM_CONFIG_PATH = []
 else:
-    if os.name == "nt":
-        programdata = os.environ.get("PROGRAMDATA", None)
-        if programdata:  # noqa: SIM108
-            SYSTEM_CONFIG_PATH = [str(Path(programdata, "jupyter"))]
-        else:  # PROGRAMDATA is not defined by default on XP.
-            SYSTEM_CONFIG_PATH = []
-    else:
-        SYSTEM_CONFIG_PATH = [
-            "/usr/local/etc/jupyter",
-            "/etc/jupyter",
-        ]
+    SYSTEM_CONFIG_PATH = [
+        "/usr/local/etc/jupyter",
+        "/etc/jupyter",
+    ]
 ENV_CONFIG_PATH: list[str] = [str(Path(sys.prefix, "etc", "jupyter"))]
 
 
@@ -986,7 +985,7 @@ def secure_write(fname: str, binary: bool = False) -> Iterator[Any]:
         else:
             # Python on windows does not respect the group and public bits for chmod, so we need
             # to take additional steps to secure the contents.
-            # Touch file pre-emptively to avoid editing permissions in open files in Windows
+            # Touch file preemptively to avoid editing permissions in open files in Windows
             fd = os.open(fname, open_flag, 0o0600)
             os.close(fd)
             open_flag = os.O_WRONLY | os.O_TRUNC

jupyter_core/troubleshoot.py

@@ -3,6 +3,7 @@
 display environment information that is frequently
 used to troubleshoot installations of Jupyter or IPython
 """
+
 from __future__ import annotations
 
 import os
@@ -68,17 +69,17 @@ def main() -> None:
         print(f"\t{directory}")
 
     print("\nsys.executable:")
-    print(f'\t{environment_data["sys_exe"]}')
+    print(f"\t{environment_data['sys_exe']}")
 
     print("\nsys.version:")
     if "\n" in environment_data["sys_version"]:
         for data in environment_data["sys_version"].split("\n"):
             print(f"\t{data}")
     else:
-        print(f'\t{environment_data["sys_version"]}')
+        print(f"\t{environment_data['sys_version']}")
 
     print("\nplatform.platform():")
-    print(f'\t{environment_data["platform"]}')
+    print(f"\t{environment_data['platform']}")
 
     if environment_data["which"]:
         print("\nwhich -a jupyter:")