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

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.9.0
+_commit: v0.9.0-23-g09afd92
 _src_path: https://github.com/usnistgov/cookiecutter-nist-python.git
 command_line_interface: typer
 conda_channel: conda-forge

.github/workflows/ci.yml

@@ -125,7 +125,7 @@ jobs:
           echo "prek_version=${prek_version}" >> "$GITHUB_ENV"
 
       - name: Setup prek
-        uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1.1.0
+        uses: j178/prek-action@79f765515bd648eb4d6bb1b17277b7cb22cb6468 # v2.0.0
         with:
           prek-version: ${{ env.prek_version }}
           install-only: true

.github/workflows/update-copier.yml

@@ -3,6 +3,12 @@ on:
   schedule:
     - cron: "0 2 * * 1" # Every Monday at 2am
   workflow_dispatch:
+    inputs:
+      automerge:
+        description: "enable automerge"
+        required: false
+        type: boolean
+        default: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -14,6 +20,7 @@ permissions:
 
 env:
   COPIER_OPTIONS: "--trust -A -r main -c 3"
+  AUTOMERGE: "false"
 
 jobs:
   update:
@@ -76,7 +83,7 @@ jobs:
               conflict_message="Resolve conflicts."
               commit_message="$commit_message [skip ci]"
             # check for new untracked files
-            elif [ -n "$(git status --untracked-files=normal --porcelain)" ]; then
+            elif git status --porcelain | grep -q '^??'; then
               automergeable='false'
             fi
           fi
@@ -96,7 +103,7 @@ jobs:
             git config --global user.name "github-actions[bot]"
             git restore --staged .
           fi
-        shell: bash -euxo pipefail {0}
+        shell: bash -euxo {0}
 
       - name: Create pull request
         if: steps.check.outputs.changed == 'true'
@@ -140,7 +147,8 @@ jobs:
 
       - name: automerge
         if:
-          ${{ steps.cpr.outputs.pull-request-number &&
+          ${{ (inputs.automerge || env.AUTOMERGE == 'true') &&
+          steps.cpr.outputs.pull-request-number &&
           steps.check.outputs.conflict_message == ''  &&
           steps.check.outputs.automergeable == 'true' }}
         env:

.pre-commit-config.yaml

@@ -17,9 +17,7 @@ repos:
   - repo: meta
     hooks:
       - id: check-hooks-apply
-        stages: [manual]
       - id: check-useless-excludes
-        stages: [manual]
 
   # * sync dependencies
   - repo: https://github.com/wpk-nist-gov/sync-pre-commit-hooks
@@ -151,7 +149,7 @@ repos:
           - "--custom-command=prek run pyproject2conda-project --all-files"
   # ** uv
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.11.0
+    rev: 0.11.1
     hooks:
       - id: uv-lock
         alias: requirements