From 65aed11a57fa106bf655bd2901c666de80a8b6ce Mon Sep 17 00:00:00 2001 From: wpk-nist-gov Date: Tue, 18 Feb 2025 17:07:00 -0500 Subject: [PATCH] chore: update cruft --- .cruft.json | 4 ++-- .pre-commit-config.yaml | 6 +++--- noxfile.py | 19 ++++++++++++------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.cruft.json b/.cruft.json index d16daf4..d7ab8c5 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/usnistgov/cookiecutter-nist-python.git", - "commit": "ea1b44f9306f1965ccf3b8cdf83ef9ad8a9dbd83", + "commit": "cf990f070ddda1ace18ec97b6c1eac9a7a772d1b", "checkout": "develop", "context": { "cookiecutter": { @@ -19,7 +19,7 @@ "__answers": "", "_copy_without_render": [], "_template": "https://github.com/usnistgov/cookiecutter-nist-python.git", - "_commit": "ea1b44f9306f1965ccf3b8cdf83ef9ad8a9dbd83" + "_commit": "cf990f070ddda1ace18ec97b6c1eac9a7a772d1b" } }, "directory": null diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9de17c4..fbee8d5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -91,7 +91,7 @@ repos: # * Commit message - repo: https://github.com/commitizen-tools/commitizen - rev: v4.2.1 + rev: v4.2.2 hooks: - id: commitizen stages: [commit-msg] @@ -99,7 +99,7 @@ repos: # * uv - repo: https://github.com/astral-sh/uv-pre-commit # uv version. - rev: 0.6.0 + rev: 0.6.1 hooks: - id: uv-lock args: [--locked] @@ -140,7 +140,7 @@ repos: # pyproject-validate (schema-store) - repo: https://github.com/henryiii/validate-pyproject-schema-store - rev: 2025.02.10 + rev: 2025.02.17 hooks: - id: validate-pyproject alias: validate-pyproject-full diff --git a/noxfile.py b/noxfile.py index d0189f9..7ee7df4 100644 --- a/noxfile.py +++ b/noxfile.py @@ -134,6 +134,7 @@ class SessionParams(DataclassParser): # common parameters lock: bool = False + no_lock: bool = False update: bool = add_option("--update", "-U", help="update dependencies/package") version: str | None = add_option( "--version", "-V", help="pretend version", default=None @@ -176,9 +177,6 @@ class SessionParams(DataclassParser): # coverage coverage: list[Literal["erase", "combine", "report", "html", "open"]] | None = None - # testdist - testdist_run: RUN_ANNO = None - # docs docs: ( list[ @@ -254,7 +252,12 @@ def parse_posargs(*posargs: str) -> SessionParams: without escaping. """ opts = SessionParams.from_posargs(posargs=posargs, prefix_char="+") - opts.lock = opts.lock or UV_LOCK + + if opts.no_lock: + opts.lock = False + else: + opts.lock = opts.lock or UV_LOCK + return opts @@ -435,8 +438,10 @@ def dev( "ipykernel", "install", "--user", - "--name=pyproject2conda-dev", - "--display-name='Python [venv: pyproject2conda-dev]'", + "--name", + "pyproject2conda-dev", + "--display-name", + "Python [venv: pyproject2conda-dev]", ) @@ -666,7 +671,7 @@ def testdist( _test( session=session, - run=opts.testdist_run, + run=opts.test_run, test_no_pytest=opts.test_no_pytest, test_options=opts.test_options, no_cov=opts.no_cov,