From 59fdb4d70e519eb2d5697d2054157c3ba09ed48b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 22 Feb 2026 05:44:31 +0000 Subject: [PATCH 1/3] Update from copier (2026-02-22T05:44:31) Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .copier-answers.yaml | 2 +- .gitignore | 10 +++++++--- Makefile | 11 +++++++---- pyproject.toml | 16 ++++++++++++++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index 77ffd4d..d04302d 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 37f89c1 +_commit: 08a244d _src_path: https://github.com/python-project-templates/base.git add_docs: false add_extension: python diff --git a/.gitignore b/.gitignore index 728063c..ea1d16c 100644 --- a/.gitignore +++ b/.gitignore @@ -144,14 +144,12 @@ js/node_modules js/test-results js/playwright-report js/*.tgz -verilator/extension # Jupyter .ipynb_checkpoints .autoversion Untitled*.ipynb -!verilator/extension/verilator.json -!verilator/extension/install.json +verilator/extension verilator/nbextension verilator/labextension @@ -161,6 +159,7 @@ verilator/labextension # Rust target +<<<<<<< before updating # Verilator verilator/bin/ verilator/examples/ @@ -177,3 +176,8 @@ verilator/tests/module/*.h verilator/tests/module/*.mk verilator/tests/module/*.dat verilator/tests/module/Vff_top +======= +# Hydra +outputs/ +multirun/ +>>>>>>> after updating diff --git a/Makefile b/Makefile index 8d54746..31fa8b4 100644 --- a/Makefile +++ b/Makefile @@ -71,12 +71,15 @@ format: fix ################ # Other Checks # ################ -.PHONY: check-manifest checks check +.PHONY: check-dist check-types checks check -check-manifest: ## check python sdist manifest with check-manifest - check-manifest -v +check-dist: ## check python sdist and wheel with check-dist + check-dist -v -checks: check-manifest +check-types: ## check python types with ty + ty check --python $$(which python) + +checks: check-dist # Alias check: checks diff --git a/pyproject.toml b/pyproject.toml index 1917660..0c21b9d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "hatchling", ] -build-backend="hatchling.build" +build-backend = "hatchling.build" [project] name = "verilator" @@ -37,15 +37,24 @@ cli = [ develop = [ "build", "bump-my-version", +<<<<<<< before updating "check-manifest", "cibuildwheel", "codespell>=2.4,<2.5", +======= + "check-dist", + "codespell", +>>>>>>> after updating "hatchling", - "mdformat>=0.7.22,<1.1", + "mdformat", "mdformat-tables>=1", "pytest", "pytest-cov", +<<<<<<< before updating "ruff>=0.9,<0.16", +======= + "ruff", +>>>>>>> after updating "twine", "ty", "uv", @@ -75,6 +84,7 @@ filename = "pyproject.toml" search = 'version = "{current_version}"' replace = 'version = "{new_version}"' +<<<<<<< before updating [tool.check-manifest] ignore = [ ".copier-answers.yaml", @@ -104,6 +114,8 @@ archs = "AMD64" environment = {WIN_FLEX_BISON="C:/ProgramData/chocolatey/lib/winflexbison3/tools"} skip = "*win32 *arm_64" +======= +>>>>>>> after updating [tool.coverage.run] branch = true omit = [ From 3108e266a5b59272d8550ab84f5ff8fc8dd825ae Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 22 Feb 2026 08:23:50 -0500 Subject: [PATCH 2/3] Update .gitignore --- .gitignore | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ea1d16c..60c7325 100644 --- a/.gitignore +++ b/.gitignore @@ -159,7 +159,10 @@ verilator/labextension # Rust target -<<<<<<< before updating +# Hydra +outputs/ +multirun/ + # Verilator verilator/bin/ verilator/examples/ @@ -176,8 +179,3 @@ verilator/tests/module/*.h verilator/tests/module/*.mk verilator/tests/module/*.dat verilator/tests/module/Vff_top -======= -# Hydra -outputs/ -multirun/ ->>>>>>> after updating From 7495248767fa724561a542c5ea96a2a482fab351 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 22 Feb 2026 08:24:26 -0500 Subject: [PATCH 3/3] Update pyproject.toml --- pyproject.toml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0c21b9d..166217d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,24 +37,15 @@ cli = [ develop = [ "build", "bump-my-version", -<<<<<<< before updating - "check-manifest", - "cibuildwheel", - "codespell>=2.4,<2.5", -======= "check-dist", + "cibuildwheel", "codespell", ->>>>>>> after updating "hatchling", "mdformat", "mdformat-tables>=1", "pytest", "pytest-cov", -<<<<<<< before updating - "ruff>=0.9,<0.16", -======= "ruff", ->>>>>>> after updating "twine", "ty", "uv", @@ -84,14 +75,6 @@ filename = "pyproject.toml" search = 'version = "{current_version}"' replace = 'version = "{new_version}"' -<<<<<<< before updating -[tool.check-manifest] -ignore = [ - ".copier-answers.yaml", - "Makefile", - "docs/**/*", -] - [tool.cibuildwheel] build = "cp39-* cp310-* cp311-* cp312-* cp313-*" test-command = "echo 'TODO'" @@ -114,13 +97,12 @@ archs = "AMD64" environment = {WIN_FLEX_BISON="C:/ProgramData/chocolatey/lib/winflexbison3/tools"} skip = "*win32 *arm_64" -======= ->>>>>>> after updating [tool.coverage.run] branch = true omit = [ "verilator/tests/integration/", ] + [tool.coverage.report] exclude_also = [ "raise NotImplementedError",