From 5b56da613e3228f6d99a317e8da7d4a4473232e9 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 May 2025 05:19:06 +0000 Subject: [PATCH 1/2] Update from copier (2025-05-04T05:19:06) --- .copier-answers.yml | 2 +- pyproject.toml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 89d057f..d2563e5 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: 839686f +_commit: c9dacb5 _src_path: https://github.com/python-project-templates/base.git add_extension: python email: dev@dau.dev diff --git a/pyproject.toml b/pyproject.toml index de67852..41f93bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,8 +149,12 @@ exclude = [ [tool.pytest.ini_options] addopts = ["-vvv", "--junitxml=junit.xml"] +<<<<<<< before updating asyncio_mode = "strict" testpaths = "python_template/tests" +======= +testpaths = "verilator/tests" +>>>>>>> after updating [tool.ruff] line-length = 150 From 2de986981a21055dc956471c950cddaf6211d17c Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 4 May 2025 06:47:02 -0500 Subject: [PATCH 2/2] Update pyproject.toml --- pyproject.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 41f93bf..2cea774 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,12 +149,7 @@ exclude = [ [tool.pytest.ini_options] addopts = ["-vvv", "--junitxml=junit.xml"] -<<<<<<< before updating -asyncio_mode = "strict" -testpaths = "python_template/tests" -======= testpaths = "verilator/tests" ->>>>>>> after updating [tool.ruff] line-length = 150