From 159604f0509f5c219c7edca04eb6a73198e23888 Mon Sep 17 00:00:00 2001 From: Sebastian Hellgren Date: Sun, 27 Sep 2026 10:08:29 +0200 Subject: [PATCH 1/4] Install VUnit from PyPI in CI The package support is in the VUnit 5.0.0.dev12 pre-release and later, so the dependency of the package installs VUnit, as it does for users. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/python_bridge.yml | 5 ----- .github/workflows/wheel_tests.yml | 1 - 2 files changed, 6 deletions(-) diff --git a/.github/workflows/python_bridge.yml b/.github/workflows/python_bridge.yml index cb42842..6b3365f 100644 --- a/.github/workflows/python_bridge.yml +++ b/.github/workflows/python_bridge.yml @@ -4,9 +4,6 @@ name: 'python bridge' # and macOS (bridge compiled on first use), Windows (prebuilt MSVC DLLs, and # a gcc build without them), the Python unit tests, the content of the # distribution, and the built wheel installed on every kind of system. -# -# VUnit is installed from the master branch of VUnit/vunit, which has the -# package support (VUnit/vunit#1221), until that is part of a VUnit release. on: push: @@ -99,7 +96,6 @@ jobs: run: | python -m venv "$RUNNER_TEMP/venv with space" echo "$RUNNER_TEMP/venv with space/bin" >> "$GITHUB_PATH" - "$RUNNER_TEMP/venv with space/bin/pip" install "vunit_hdl @ git+https://github.com/VUnit/vunit.git@master" --progress-bar off "$RUNNER_TEMP/venv with space/bin/pip" install -e . pytest --progress-bar off - name: '🚧 Python unit tests' @@ -176,7 +172,6 @@ jobs: run: | python -m venv "$RUNNER_TEMP/venv with space" echo "$RUNNER_TEMP/venv with space/Scripts" >> "$GITHUB_PATH" - "$RUNNER_TEMP/venv with space/Scripts/pip" install "vunit_hdl @ git+https://github.com/VUnit/vunit.git@master" --progress-bar off "$RUNNER_TEMP/venv with space/Scripts/pip" install -e . --progress-bar off # The simulator is accepted as x64, and a 32-bit executable of Windows itself is detected diff --git a/.github/workflows/wheel_tests.yml b/.github/workflows/wheel_tests.yml index 9c0fbef..9aae7bd 100644 --- a/.github/workflows/wheel_tests.yml +++ b/.github/workflows/wheel_tests.yml @@ -91,7 +91,6 @@ jobs: python -m venv "$RUNNER_TEMP/venv" scripts="$RUNNER_TEMP/venv/$([ "$RUNNER_OS" = Windows ] && echo Scripts || echo bin)" echo "$scripts" >> "$GITHUB_PATH" - "$scripts/pip" install "vunit_hdl @ git+https://github.com/VUnit/vunit.git@master" --progress-bar off "$scripts/pip" install dist/*.whl --progress-bar off - name: '🚧 Feature tests against the installed wheel' From 26e85e1a57b169b46b8eec9a6484a6b93debd60f Mon Sep 17 00:00:00 2001 From: Sebastian Hellgren Date: Sun, 27 Sep 2026 10:08:29 +0200 Subject: [PATCH 2/4] Drop the instructions to install VUnit from master VUnit with the package support is on PyPI as a pre-release. Co-Authored-By: Claude Opus 5.5 --- README.md | 5 ++--- pyproject.toml | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index de4404e..c4e43a7 100644 --- a/README.md +++ b/README.md @@ -72,9 +72,8 @@ check(call_integer_vector("gain", arg(integer_vector'(1, 2))) = integer_vector'( ## Requirements - `vunit_hdl >= 5.0.0.dev12`, the version carrying the support for packages and simulator hooks - ([VUnit/vunit#1221](https://github.com/VUnit/vunit/pull/1221)). Until that is part of a release, - install VUnit from its master branch: - `pip install git+https://github.com/VUnit/vunit.git@master` + ([VUnit/vunit#1221](https://github.com/VUnit/vunit/pull/1221)), a pre-release on PyPI that + installing the package pulls in. - VHDL-2008 or later. - CPython 3.10 or later, standard (GIL) build, with a shared `libpython` (`--enable-shared`), which is what distribution Pythons, `actions/setup-python`, `uv` and `pyenv` provide by default. diff --git a/pyproject.toml b/pyproject.toml index f3c2336..accda0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,8 +23,7 @@ classifiers = [ ] dependencies = [ "numpy", - # The VUnit adding packages and simulator hooks, VUnit/vunit#1221. Until that is - # part of a release: pip install git+https://github.com/VUnit/vunit.git@master + # The first VUnit with packages and simulator hooks, VUnit/vunit#1221 "vunit_hdl>=5.0.0.dev12", ] From 898335b94547e7c69178ee6385f751d113bbc6ed Mon Sep 17 00:00:00 2001 From: Sebastian Hellgren Date: Sun, 27 Sep 2026 10:08:29 +0200 Subject: [PATCH 3/4] Require setuptools 77, the first with SPDX license expressions Older versions reject license = "MPL-2.0" with license-files. Co-Authored-By: Claude Opus 5.5 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index accda0a..9fa0513 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=61"] +requires = ["setuptools>=77"] build-backend = "setuptools.build_meta" [project] From 44ba4cdd2c5e974dcb5fef7278228719e1ca9cb5 Mon Sep 17 00:00:00 2001 From: Sebastian Hellgren Date: Sun, 27 Sep 2026 10:47:29 +0200 Subject: [PATCH 4/4] State only the VUnit version the package requires Co-Authored-By: Claude Opus 5.5 --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index c4e43a7..9c07872 100644 --- a/README.md +++ b/README.md @@ -71,9 +71,7 @@ check(call_integer_vector("gain", arg(integer_vector'(1, 2))) = integer_vector'( ## Requirements -- `vunit_hdl >= 5.0.0.dev12`, the version carrying the support for packages and simulator hooks - ([VUnit/vunit#1221](https://github.com/VUnit/vunit/pull/1221)), a pre-release on PyPI that - installing the package pulls in. +- VUnit 5.0.0.dev12 or later (`vunit_hdl` on PyPI), which pip installs with the package. - VHDL-2008 or later. - CPython 3.10 or later, standard (GIL) build, with a shared `libpython` (`--enable-shared`), which is what distribution Pythons, `actions/setup-python`, `uv` and `pyenv` provide by default.