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

Author: wpk-nist-gov

.copier-answers.yml

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

.github/workflows/ci.yml

@@ -150,7 +150,7 @@ jobs:
           persist-credentials: false
 
       - name: Pin actions
-        uses: suzuki-shunsuke/pinact-action@1081f5ad49ac904b7d977784f338145150a32112 # v1.4.0
+        uses: suzuki-shunsuke/pinact-action@cf51507d80d4d6522a07348e3d58790290eaf0b6 # v2.0.0
         with:
           skip_push: "true"
 

.pre-commit-config.yaml

@@ -66,7 +66,7 @@ repos:
         files: ^pyproject\.toml$
   # ** validate (schema-store)
   - repo: https://github.com/henryiii/validate-pyproject-schema-store
-    rev: 2026.03.27
+    rev: 2026.03.29
     hooks:
       - id: validate-pyproject
         name: validate-pyproject-schema-store
@@ -99,7 +99,7 @@ repos:
 
   # Just
   - repo: https://github.com/wpk-nist-gov/just-pre-commit
-    rev: v1.48.0
+    rev: v1.48.1
     hooks:
       - id: justfile-format
 

CONTRIBUTING.md

@@ -61,7 +61,7 @@ Ready to contribute? Here's how to make a contribution.
   ```
 
   If the repo includes submodules, you can add them either with the initial
-  close using:
+  clone using:
 
   ```bash
   git clone --recursive-submodules git@github.com:your_name_here/pyproject2conda.git

docs/conf.py

@@ -22,6 +22,7 @@
 
 import os
 import sys
+from importlib.util import find_spec
 from pathlib import Path
 from typing import Any
 
@@ -465,11 +466,6 @@ def linkcode_resolve(domain: str, info: dict[str, Any]) -> str | None:
 
 
 # only set spelling stuff if installed:
-try:
-    import sphinxcontrib.spelling  # noqa: F401
-
+if find_spec("sphinxcontrib.spelling") is not None:
     extensions += ["sphinxcontrib.spelling"]
     spelling_word_list_filename = "spelling_wordlist.txt"
-
-except ImportError:
-    pass

justfile

@@ -74,7 +74,7 @@ lint-manual *commands: (pre-commit "run --all-files --hook-stage=manual" command
 
 alias lint-all := lint-manual
 
-# run prettier/markdownlint/pypoject-fmt
+# run prettier/markdownlint/pyproject-fmt
 [group("lint")]
 prettier: (lint "pyproject-fmt") (lint-manual "markdownlint")
 
@@ -220,7 +220,7 @@ typecheck-all *checkers="mypy basedpyright": (nox "-s typecheck -- +m" checkers)
 
 # * docs -----------------------------------------------------------------------
 
-# build docs.  Optioons {html, spelling, livehtml, linkcheck, open}.
+# build docs.  Options {html, spelling, livehtml, linkcheck, open}.
 [group("docs")]
 [group("nox")]
 docs *options="html": (nox "-s docs -- +d" options)

tools/noxtools.py

@@ -1,4 +1,4 @@
-"""Utilities to wonferrk with nox"""
+"""Utilities to work with nox"""
 
 from __future__ import annotations
 
@@ -17,8 +17,6 @@
 
     from nox import Session
 
-    PathLike = str | Path
-
 
 # * Top level installation functions ---------------------------------------------------
 def py_prefix(python_version: Any) -> str:

tools/requirements_lock.py

@@ -4,6 +4,7 @@
 
 import logging
 import shlex
+import shutil
 import sys
 from argparse import ArgumentParser
 from pathlib import Path
@@ -99,6 +100,32 @@ def _lock_files(
         _ = check_call(options)
 
 
+# NOTE(wpk): This will not be needed once https://github.com/astral-sh/uv/issues/18155 is closed
+def _maybe_copy_lockfile(lock_path: Path) -> Path | None:
+    if not lock_path.exists():
+        return None
+
+    # copy lockfile to temp location
+    import tempfile
+
+    with tempfile.TemporaryDirectory(delete=False) as tmp_dir:
+        new_path = Path(tmp_dir) / lock_path.name
+        logger.info("backing up current uv.lock to %s", new_path)
+        shutil.copy2(lock_path, new_path)
+    return new_path
+
+
+def _only_changed_exclude_newer_time(old_path: Path, new_path: Path) -> bool:
+    import tomllib
+
+    old_data, new_data = (
+        tomllib.loads(path.read_text(encoding="utf-8")) for path in (old_path, new_path)
+    )
+    old_data["options"]["exclude-newer"] = "0"
+    new_data["options"]["exclude-newer"] = "0"
+    return old_data == new_data
+
+
 def _maybe_lock_or_sync(
     lock: bool,
     sync: bool,
@@ -112,17 +139,29 @@ def _maybe_lock_or_sync(
         else:
             lock = True
 
-    if lock or sync:
-        command = [
-            "uv",
-            ("sync" if sync else "lock"),
-            *(["--no-active"] if sync else []),
-            *(["--upgrade"] if upgrade else []),
-            *uv_options,
-        ]
-
-        logger.info(shlex.join(command))
-        _ = check_call(command)
+    if not (lock or sync):
+        return
+
+    lock_path = Path("uv.lock")
+    old_lock_path = _maybe_copy_lockfile(lock_path) if upgrade else None
+
+    # update lock_path
+    command = [
+        "uv",
+        ("sync" if sync else "lock"),
+        *(["--no-active"] if sync else []),
+        *(["--upgrade"] if upgrade else []),
+        *uv_options,
+    ]
+
+    logger.info(shlex.join(command))
+    _ = check_call(command)
+
+    if old_lock_path is not None and _only_changed_exclude_newer_time(
+        old_lock_path, lock_path
+    ):
+        logger.info("only exclude-newer timestamp changed.  Keeping old file")
+        shutil.move(old_lock_path, lock_path)
 
 
 def main(args: Sequence[str] | None = None) -> int: