From 70ed77952f16b9f33d56a5a609177a487bd4b482 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 6 Jul 2025 05:16:55 +0000 Subject: [PATCH 1/3] Update from copier (2025-07-06T05:16:55) --- .copier-answers.yaml | 3 ++- .gitignore | 10 ++++++++++ pyproject.toml | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index a1647a5..639fae3 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,6 +1,7 @@ # Changes here will be overwritten by Copier -_commit: 42057e0 +_commit: 8c06bd5 _src_path: https://github.com/python-project-templates/base.git +add_docs: false add_extension: python email: t.paine154@gmail.com github: python-project-templates diff --git a/.gitignore b/.gitignore index 5e96e1e..5ca5462 100644 --- a/.gitignore +++ b/.gitignore @@ -115,6 +115,7 @@ ENV/ # Thumbnails ._* +<<<<<<< before updating # Files that might appear in the root of a volume .DocumentRevisions-V100 .fseventsd @@ -122,6 +123,15 @@ ENV/ .TemporaryItems .Trashes .VolumeIcon.icns +======= +# Documentation +/site +index.md +docs/_build/ +docs/src/_build/ +docs/api +docs/index.md +>>>>>>> after updating # Directories potentially created on remote AFP share .AppleDB diff --git a/pyproject.toml b/pyproject.toml index 5c89714..4a1a6e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -129,4 +129,8 @@ known-first-party = ["hatch_cpp"] section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"] [tool.ruff.lint.per-file-ignores] +<<<<<<< before updating "__init__.py" = ["F401", "F403"] +======= +"__init__.py" = ["F401", "F403"] +>>>>>>> after updating From a058a28e5fcf44f6fff3be0f0874b06fdecd3459 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 6 Jul 2025 19:55:07 -0400 Subject: [PATCH 2/3] Update .gitignore --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5ca5462..999ba3f 100644 --- a/.gitignore +++ b/.gitignore @@ -115,7 +115,6 @@ ENV/ # Thumbnails ._* -<<<<<<< before updating # Files that might appear in the root of a volume .DocumentRevisions-V100 .fseventsd @@ -123,7 +122,7 @@ ENV/ .TemporaryItems .Trashes .VolumeIcon.icns -======= + # Documentation /site index.md @@ -131,7 +130,6 @@ docs/_build/ docs/src/_build/ docs/api docs/index.md ->>>>>>> after updating # Directories potentially created on remote AFP share .AppleDB From 377e3ccea4dd566ee1c351d2a29b1c404630e387 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 6 Jul 2025 19:55:33 -0400 Subject: [PATCH 3/3] Update pyproject.toml --- pyproject.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4a1a6e8..5c89714 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -129,8 +129,4 @@ known-first-party = ["hatch_cpp"] section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"] [tool.ruff.lint.per-file-ignores] -<<<<<<< before updating "__init__.py" = ["F401", "F403"] -======= -"__init__.py" = ["F401", "F403"] ->>>>>>> after updating