From bf8e09f7dc2f090cd06c45e2dd19a68cd572143a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:06:14 +0000 Subject: [PATCH 1/4] Update from copier (2025-08-01T14:06:14) Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .copier-answers.yaml | 3 ++- Makefile | 24 ++++++++++++++++++------ README.md | 3 +++ pyproject.toml | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index 484daee..a0943a5 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,8 +1,9 @@ # Changes here will be overwritten by Copier -_commit: c53b04c +_commit: 9642da9 _src_path: https://github.com/python-project-templates/base.git add_docs: false add_extension: python +add_wiki: false email: t.paine154@gmail.com github: python-project-templates project_description: Hatch plugin for C++ builds diff --git a/Makefile b/Makefile index adac7f6..db9ea46 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,11 @@ develop: ## install dependencies and build library uv pip install -e .[develop] +requirements: ## install prerequisite python build requirements + python -m pip install --upgrade pip toml + python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))'` + python -m pip install `python -c 'import toml; c = toml.load("pyproject.toml"); print(" ".join(c["project"]["optional-dependencies"]["develop"]))'` + build: ## build the python library python -m build -n @@ -15,20 +20,27 @@ install: ## install library ######### # LINTS # ######### -.PHONY: lint lints fix format +.PHONY: lint-py lint-docs fix-py fix-docs lint lints fix format -lint: ## run python linter with ruff +lint-py: ## lint python with ruff python -m ruff check hatch_cpp python -m ruff format --check hatch_cpp -# Alias -lints: lint +lint-docs: ## lint docs with mdformat and codespell + python -m mdformat --check README.md + python -m codespell_lib README.md -fix: ## fix python formatting with ruff +fix-py: ## autoformat python code with ruff python -m ruff check --fix hatch_cpp python -m ruff format hatch_cpp -# alias +fix-docs: ## autoformat docs with mdformat and codespell + python -m mdformat README.md + python -m codespell_lib --write README.md + +lint: lint-py lint-docs ## run all linters +lints: lint +fix: fix-py fix-docs ## run all autoformatters format: fix ################ diff --git a/README.md b/README.md index 2d254b9..4b25dd8 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Hatch plugin for C++ builds ## Overview +<<<<<<< before updating A simple, extensible C++ build plugin for [hatch](https://hatch.pypa.io/latest/). ```toml @@ -31,5 +32,7 @@ For more complete systems, see: |`HATCH_CPP_PLATFORM`| | | |`HATCH_CPP_DISABLE_CCACHE`| | | +======= +>>>>>>> after updating > [!NOTE] > This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base). diff --git a/pyproject.toml b/pyproject.toml index 5c89714..2f296bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,17 @@ develop = [ "build", "bump-my-version", "check-manifest", +<<<<<<< before updating "ruff>=0.3,<0.13", +======= + "codespell>=2.4,<2.5", + "hatchling", + "mdformat>=0.7.22,<0.8", + "mdformat-tables>=1", + "pytest", + "pytest-cov", + "ruff", +>>>>>>> after updating "twine", "uv", "wheel", @@ -67,7 +77,12 @@ Homepage = "https://github.com/python-project-templates/hatch-cpp" [tool.bumpversion] current_version = "0.1.7" commit = true +<<<<<<< before updating tag = false +======= +tag = true +commit_args = "-s" +>>>>>>> after updating [[tool.bumpversion.files]] filename = "hatch_cpp/__init__.py" From 7dc8e0dd33f082293acfb62d3291f711ddcfd0d3 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Fri, 1 Aug 2025 11:37:09 -0400 Subject: [PATCH 2/4] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 4b25dd8..2d254b9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Hatch plugin for C++ builds ## Overview -<<<<<<< before updating A simple, extensible C++ build plugin for [hatch](https://hatch.pypa.io/latest/). ```toml @@ -32,7 +31,5 @@ For more complete systems, see: |`HATCH_CPP_PLATFORM`| | | |`HATCH_CPP_DISABLE_CCACHE`| | | -======= ->>>>>>> after updating > [!NOTE] > This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base). From c09cbbfeac78ef1be3c410bc5b9d7d857cae87c5 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Fri, 1 Aug 2025 11:37:25 -0400 Subject: [PATCH 3/4] Update pyproject.toml --- pyproject.toml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2f296bc..c494e3b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,9 +42,6 @@ develop = [ "build", "bump-my-version", "check-manifest", -<<<<<<< before updating - "ruff>=0.3,<0.13", -======= "codespell>=2.4,<2.5", "hatchling", "mdformat>=0.7.22,<0.8", @@ -52,7 +49,6 @@ develop = [ "pytest", "pytest-cov", "ruff", ->>>>>>> after updating "twine", "uv", "wheel", @@ -77,12 +73,8 @@ Homepage = "https://github.com/python-project-templates/hatch-cpp" [tool.bumpversion] current_version = "0.1.7" commit = true -<<<<<<< before updating tag = false -======= -tag = true commit_args = "-s" ->>>>>>> after updating [[tool.bumpversion.files]] filename = "hatch_cpp/__init__.py" From f95574509a7adae51e42033166a5c256c042bddb Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Fri, 1 Aug 2025 11:39:06 -0400 Subject: [PATCH 4/4] fix lint --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2d254b9..a468e43 100644 --- a/README.md +++ b/README.md @@ -19,17 +19,19 @@ libraries = [ ``` For more complete systems, see: + - [scikit-build-core](https://github.com/scikit-build/scikit-build-core) - [setuptools](https://setuptools.pypa.io/en/latest/userguide/ext_modules.html) ## Environment Variables -| Name | Default | Description | -|:-----|:--------|:------------| -|`CC`| | | -|`CXX`| | | -|`LD`| | | -|`HATCH_CPP_PLATFORM`| | | -|`HATCH_CPP_DISABLE_CCACHE`| | | + +| Name | Default | Description | +| :------------------------- | :------ | :---------- | +| `CC` | | | +| `CXX` | | | +| `LD` | | | +| `HATCH_CPP_PLATFORM` | | | +| `HATCH_CPP_DISABLE_CCACHE` | | | > [!NOTE] > This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).