chore(template): accept new copier update (#60)

Co-authored-by: wpk-nist-gov <5348008+wpk-nist-gov@users.noreply.github.com>

Author: wpk-nist-gov

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v0.11.0-7-g0d0a7bc
+_commit: v0.12.0-3-gfa0bc11
 _src_path: https://github.com/usnistgov/cookiecutter-nist-python.git
 command_line_interface: typer
 conda_channel: conda-forge

.pre-commit-config.yaml

@@ -176,7 +176,7 @@ repos:
       - id: check-github-actions
         alias: actions
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.11
+    rev: v1.7.12
     hooks:
       - id: actionlint
         alias: actions

justfile

@@ -149,7 +149,7 @@ sync *options: (_requirements "--sync" options)
 [group("requirements")]
 lock *options: (_requirements "--lock" options)
 
-# Rebuild requirements, lock requirements, and run uv sync if .venv exists or uv lock if not.  Pass --upgrade/-U to upgrade
+# Rebu         ild requirements, lock requirements, and run uv sync if .venv exists or uv lock if not.  Pass --upgrade/-U to upgrade
 [group("requirements")]
 requirements *options: (_requirements "--sync-or-lock" options)
 
@@ -196,8 +196,17 @@ pyrefly *options: (_typecheck "-cpyrefly" options)
 # Run pylint (with optional args)
 [group("lint")]
 [group("typecheck")]
-pylint *options="src tests":
-    {{ UVRUN }} {{ TYPECHECK_UVRUN_OPTS }} pylint {{ PYLINT_OPTS }} {{ options }}
+pylint:
+    #!/usr/bin/env sh
+    set -exu
+    possible=("src" "tests" "noxfile.py" "tools" "scripts")
+    options=()
+    for d in "${possible[@]}"; do
+        if [ -e "$d" ]; then
+            options+=("$d")
+        fi
+    done
+    {{ UVRUN }} {{ TYPECHECK_UVRUN_OPTS }} pylint {{ PYLINT_OPTS }} "${options[@]}"
 
 # Run all checkers (with optional directories)
 [group("typecheck")]
@@ -207,8 +216,7 @@ typecheck *options: (_typecheck "-cmypy[faster-cache] -cbasedpyright -cpyrefly -
 [group("tools")]
 [group("typecheck")]
 @typecheck-tools *files="noxfile.py tools/*.py":
-    -just TYPECHECK_UVRUN_OPTS="--only-group=nox --only-group=typecheck-runner" mypy -- --strict {{ files }}
-    just TYPECHECK_UVRUN_OPTS="--only-group=nox --only-group=typecheck-runner" basedpyright -- {{ files }}
+    -just TYPECHECK_UVRUN_OPTS="--only-group=nox --only-group=typecheck-runner" _typecheck "-c'mypy[faster-cache] --strict' -cbasedpyright -cpyrefly -cty" {{ files }}
     just TYPECHECK_UVRUN_OPTS="--only-group=nox --only-group=pylint" pylint {{ files }}
 
 # ** typecheck all

noxfile.py

@@ -361,6 +361,7 @@ def install_package(
     installpkg: str | None = None,
 ) -> None:
     """Install current package."""
+    run: Callable[..., Any]
     if installpkg is not None:
         run = session.run
         opts = [*args, installpkg]
@@ -382,50 +383,59 @@ def install_package(
     )
 
 
-def get_package_wheel(
-    session: Session,
-    opts: str | Iterable[str] | None = None,
-    extras: str | Iterable[str] | None = None,
-    reuse: bool = True,
-) -> str:
-    """
-    Build the package in return the build location.
+class _GetPackageWheel:
+    """Interface to get_package_wheel"""
 
-    This is similar to how tox does isolated builds.
+    def __init__(self) -> None:
+        self._called = False
 
-    Note that the first time this is called,
+    def __call__(
+        self,
+        session: Session,
+        opts: str | Iterable[str] | None = None,
+        extras: str | Iterable[str] | None = None,
+        reuse: bool = True,
+    ) -> str:
+        """
+        Build the package in return the build location.
 
-    Should be straightforward to extend this to isolated builds
-    that depend on python version (something like have session build-3.11 ....)
-    """
-    dist_location = Path(session.cache_dir) / "dist"
-    if reuse and getattr(get_package_wheel, "_called", False):
-        session.log("Reuse isolated build")
-    else:
-        shutil.rmtree(dist_location, ignore_errors=True)
-        session.run_always("uv", "build", f"--out-dir={dist_location}", "--wheel")
+        This is similar to how tox does isolated builds.
+
+        Note that the first time this is called,
+
+        Should be straightforward to extend this to isolated builds
+        that depend on python version (something like have session build-3.11 ....)
+        """
+        dist_location = Path(session.cache_dir) / "dist"
+        if reuse and self._called:
+            session.log("Reuse isolated build")
+        else:
+            shutil.rmtree(dist_location, ignore_errors=True)
+            session.run_always("uv", "build", f"--out-dir={dist_location}", "--wheel")
+
+            # save that this was called:
+            if reuse:
+                self._called = True
 
-        # save that this was called:
-        if reuse:
-            get_package_wheel._called = True  # type: ignore[attr-defined]  # pyright: ignore[reportFunctionMemberAccess] # noqa: SLF001  # pylint: disable=protected-access
+        paths = list(dist_location.glob("*.whl"))
+        if len(paths) != 1:
+            msg = f"something wonky with paths {paths}"
+            raise ValueError(msg)
 
-    paths = list(dist_location.glob("*.whl"))
-    if len(paths) != 1:
-        msg = f"something wonky with paths {paths}"
-        raise ValueError(msg)
+        path = f"{PACKAGE_NAME}@{paths[0]}"
+        if extras:
+            if not isinstance(extras, str):
+                extras = ",".join(extras)
+            path = f"{path}[{extras}]"
 
-    path = f"{PACKAGE_NAME}@{paths[0]}"
-    if extras:
-        if not isinstance(extras, str):
-            extras = ",".join(extras)
-        path = f"{path}[{extras}]"
+        if opts:
+            if not isinstance(opts, str):
+                opts = " ".join(opts)
+            path = f"{path} {opts}"
+        return path
 
-    if opts:
-        if not isinstance(opts, str):
-            opts = " ".join(opts)
-        path = f"{path} {opts}"
 
-    return path
+get_package_wheel = _GetPackageWheel()
 
 
 # * uvx runner ----------------------------------------------------------------
@@ -442,7 +452,7 @@ def uvx_run(
     session: Session, *args: str | PathLike[str], locked: bool = True, **kwargs: Any
 ) -> Any:
     """Run command using uvx"""
-    return session.run("uvx", *get_uvx_constraint_args(locked), *args, **kwargs)
+    return session.run("uvx", *get_uvx_constraint_args(locked), *args, **kwargs)  # pyright: ignore[reportUnknownVariableType]
 
 
 def pre_commit_run(
@@ -735,7 +745,7 @@ def lint(
 # ** type checking
 @nox.session(name="typecheck", **ALL_KWS)
 @add_opts
-def typecheck(
+def typecheck(  # noqa: PLR0912
     session: nox.Session,
     opts: SessionParams,
 ) -> None:
@@ -745,10 +755,16 @@ def typecheck(
 
     cmd = opts.typecheck or []
     if not opts.typecheck_run and not cmd:
-        cmd = ["mypy", "basedpyright", "pyrefly", "ty"]
+        cmd = ["all"]
 
     if "all" in cmd:
-        cmd = ["mypy", "basedpyright", "pyrefly", "ty", "pylint"]
+        cmd = [
+            "mypy",
+            "basedpyright",
+            "pyrefly",
+            "ty",
+            "pylint",
+        ]
 
     # set the cache directory for mypy
     session.env["MYPY_CACHE_DIR"] = str(Path(session.create_tmp()) / ".mypy_cache")
@@ -757,38 +773,50 @@ def typecheck(
         cmd = list(cmd)
         cmd.remove("clean")
 
-        for name in (".mypy_cache", ".pytype"):
+        for name in (".mypy_cache",):
             p = Path(session.create_tmp()) / name
             if p.exists():
                 session.log(f"removing cache {p}")
                 shutil.rmtree(p)
 
-    if not isinstance(session.python, str):
-        raise TypeError
-
+    # do all typecheckers in one go
+    typecheckers: list[str] = []
+    othercheckers: list[str] = []
     for c in cmd:
         if c in {"mypy", "pyright", "basedpyright", "ty", "pyrefly"}:
-            checker = "mypy[faster-cache]" if c == "mypy" else c
-            session.run(
-                "typecheck-runner",
-                *get_uvx_constraint_args(),
-                "--verbose",
-                f"--check={checker}",
-                "--allow-errors",
-                external=False,
-            )
-        elif c == "pylint":
+            typecheckers.append(f"--check={'mypy[faster-cache]' if c == 'mypy' else c}")
+        else:
+            othercheckers.append(c)
+
+    if typecheckers:
+        session.run(
+            "typecheck-runner",
+            *get_uvx_constraint_args(),
+            "--verbose",
+            *typecheckers,
+            "--",
+            external=False,
+        )
+
+    for other in othercheckers:
+        if other == "pylint":
+            paths = [
+                x
+                for x in ("src", "tests", "noxfile.py", "scripts", "tools")
+                if Path(x).exists()
+            ]
             session.run(
                 "pylint",
                 # A bit dangerous, but needed to allow pylint
                 # to work across versions.
                 "--disable=unrecognized-option",
                 "--enable-all-extensions",
-                "src",
-                "tests",
+                *paths,
             )
+        elif other.endswith("-notebook"):
+            uvx_run(session, "--from=rust-just", "just", other)
         else:
-            session.log(f"Skipping unknown command {c}")
+            session.log(f"Skipping unknown command {other}")
 
 
 # ** Dist conda

pyproject.toml

@@ -64,6 +64,7 @@ test = [
 ]
 type = [
     "types-click",
+    { include-group = "nox" },
     { include-group = "pylint" },
     { include-group = "pytest" },
     { include-group = "typecheck-runner" },
@@ -159,17 +160,12 @@ CPY = "CPY"
 
 # * typecheck ---------------------------------------------------------------------
 [tool.mypy]
-exclude = [
-    ".eggs",
-    ".nox",
-    ".numba_cache",
-    ".tox",
-    ".venv",
-    "docs",
-]
 files = [
     "src",
     "tests",
+    # tools
+    "noxfile.py",
+    "tools",
 ]
 strict = true
 # options
@@ -186,7 +182,14 @@ warn_unused_ignores = true
 
 [tool.pyrefly]
 enabled-ignores = [ "pyrefly" ]
-project-includes = [ "src", "tests" ]
+project-includes = [
+    "src",
+    "tests",
+    # tools
+    "noxfile.py",
+    "tools",
+]
+search-path = [ "." ]
 
 [tool.pyright]
 exclude = [
@@ -203,6 +206,9 @@ exclude = [
 include = [
     "src",
     "tests",
+    # tools
+    "noxfile.py",
+    "tools",
 ]
 strict = [
     "noxfile.py",
@@ -243,7 +249,13 @@ reportUnusedCallResult = false
 [tool.ty]
 # Disable support for `type: ignore` comments
 analysis.respect-type-ignore-comments = false
-src.include = [ "src", "tests" ]
+src.include = [
+    "src",
+    "tests",
+    # tools
+    "noxfile.py",
+    "tools",
+]
 
 # * Testing --------------------------------------------------------------------
 [tool.pytest.ini_options]