From 82d51f63cc1982ac1b6980a05c60413294a43744 Mon Sep 17 00:00:00 2001 From: allenporter <6026418+allenporter@users.noreply.github.com> Date: Tue, 21 May 2024 00:32:47 +0000 Subject: [PATCH 1/2] chore: accept new Cruft update --- .cruft.json | 2 +- .pre-commit-config.yaml | 1 + requirements_dev.txt.rej | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 requirements_dev.txt.rej diff --git a/.cruft.json b/.cruft.json index 338e14c3..7c3e00b6 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/allenporter/cookiecutter-python", - "commit": "09fcc9a7574cc92301d2b72ea2535fed208a2e39", + "commit": "fd77e07506da36d1a1e1165363026ddef564bc1a", "checkout": null, "context": { "cookiecutter": { diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3fb815a0..d8644f1c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -36,6 +36,7 @@ repos: - id: yamllint exclude: '^tests/tool/testdata/.*\.yaml$' args: + - --strict - -c - ".yaml-lint.yaml" - repo: https://github.com/asottile/setup-cfg-fmt diff --git a/requirements_dev.txt.rej b/requirements_dev.txt.rej new file mode 100644 index 00000000..80126570 --- /dev/null +++ b/requirements_dev.txt.rej @@ -0,0 +1,10 @@ +diff a/requirements_dev.txt b/requirements_dev.txt (rejected hunks) +@@ -4,7 +4,7 @@ coverage==7.5.1 + mypy==1.10.0 + pdoc==14.4.0 + pip==24.0 +-pre-commit==3.6.0 ++pre-commit==3.7.1 + pytest-cov==5.0.0 + pytest==8.2.0 + ruff==0.4.4 From f4c34e41c1e68bc4ba0777500855a2414e6ee7e6 Mon Sep 17 00:00:00 2001 From: Allen Porter Date: Mon, 20 May 2024 18:53:29 -0700 Subject: [PATCH 2/2] Delete requirements_dev.txt.rej --- requirements_dev.txt.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 requirements_dev.txt.rej diff --git a/requirements_dev.txt.rej b/requirements_dev.txt.rej deleted file mode 100644 index 80126570..00000000 --- a/requirements_dev.txt.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/requirements_dev.txt b/requirements_dev.txt (rejected hunks) -@@ -4,7 +4,7 @@ coverage==7.5.1 - mypy==1.10.0 - pdoc==14.4.0 - pip==24.0 --pre-commit==3.6.0 -+pre-commit==3.7.1 - pytest-cov==5.0.0 - pytest==8.2.0 - ruff==0.4.4