diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 944d87d..d99f738 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,10 +48,10 @@ jobs: python: ["3.11", "3.12", "3.13", "3.14"] env: # WIRELOG_VERSION here is the exact wirelog ref CI builds against. - # The default is pinned to the wirelog v0.50.0 release commit; + # The default is pinned to the wirelog v0.51.0 release commit; # override the repository variable to test another ref before # updating this fallback. - WIRELOG_VERSION: ${{ vars.WIRELOG_VERSION || '272edf3a24b25676f12c4b843d55510f5048dd2f' }} + WIRELOG_VERSION: ${{ vars.WIRELOG_VERSION || '0c6e0cdaee7db069be5d8d896bb59bdcb15673e9' }} # `runner.temp` is NOT available in job-level `env:` (only in # step-level contexts) — using it here caused the whole workflow # to fail at startup (#114). `github.workspace` IS resolvable at @@ -66,7 +66,7 @@ jobs: with: python-version: ${{ matrix.python }} - # Resolve WIRELOG_VERSION (a tag like `v0.50.0`, a branch ref + # Resolve WIRELOG_VERSION (a tag like `v0.51.0`, a branch ref # like `main`, or an exact commit SHA) to the underlying commit # SHA. The cache key uses the SHA — not the version label — so that: # * a moving ref like `main` invalidates the cache each time diff --git a/CHANGELOG.md b/CHANGELOG.md index e987a9c..24b293f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,26 @@ wirelog floor and a validated wirelog ref (see ## [Unreleased] +## [1.0.1] - 2026-06-13 + +### Changed +- The bundled and validated wirelog ref moves from `v0.50.0` to + `v0.51.0` at peeled SHA + `0c6e0cdaee7db069be5d8d896bb59bdcb15673e9`. This is a wirelog-only + rebuild: the PyreWire public API is unchanged and the minimum + compatible runtime wirelog version remains `0.44.0`. + +### Fixed +- A rule with a single `relation(...)` body atom now derives its head + when the program also contains the recursive `edge`/`path` rules. + Previously such one-condition rules (for example `requires_review(...)` + and `warning(...)`) were silently missing from `EasySession.step()` + results. The root cause was a wirelog evaluation bug — the iteration + context was not reset for non-recursive strata — fixed upstream in + wirelog#914 and first shipped in wirelog `v0.51.0`. PyreWire performs + no rule evaluation of its own, so bumping the bundled engine is the + fix (#165). + ## [1.0.0] - 2026-05-27 ### Added @@ -121,6 +141,7 @@ wirelog floor and a validated wirelog ref (see wirelog#852. They are available in the later [1.0.0] line, whose validated wirelog ref is v0.50.0. Tracked in wirelog#859. -[Unreleased]: https://github.com/semantic-reasoning/PyreWire/compare/v1.0.0...HEAD +[Unreleased]: https://github.com/semantic-reasoning/PyreWire/compare/v1.0.1...HEAD +[1.0.1]: https://github.com/semantic-reasoning/PyreWire/compare/v1.0.0...v1.0.1 [1.0.0]: https://github.com/semantic-reasoning/PyreWire/compare/v0.41.0...v1.0.0 [0.41.0]: https://github.com/semantic-reasoning/PyreWire/releases/tag/v0.41.0 diff --git a/docs/support.md b/docs/support.md index 2c3ebf7..25d7c8f 100644 --- a/docs/support.md +++ b/docs/support.md @@ -19,8 +19,8 @@ not need to install wirelog separately. | macOS | `arm64` | `macos-15` | Apple Silicon only for v1.0; no macOS Intel or universal2 wheel is produced. | | Windows | `win_amd64` / `AMD64` | `windows-2025-vs2026` | Built with MSVC and repaired with delvewheel. | -The bundled library is built from wirelog v0.50.0, using peeled SHA -`272edf3a24b25676f12c4b843d55510f5048dd2f`. +The bundled library is built from wirelog v0.51.0, using peeled SHA +`0c6e0cdaee7db069be5d8d896bb59bdcb15673e9`. ## Source Distributions diff --git a/docs/versioning.md b/docs/versioning.md index e822788..a6a6221 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -55,6 +55,7 @@ release to publish; it is **not** tied to the wirelog change. | PyreWire | Minimum wirelog | Validated wirelog ref | Notes | | --------------- | --------------- | ------------------------------------------ | ----------------------- | | `1.0.0` | `0.44.0` | `272edf3a24b25676f12c4b843d55510f5048dd2f` | Validated against wirelog `v0.50.0` (peeled tag SHA); runtime minimum remains `0.44.0`. | +| `1.0.1` | `0.44.0` | `0c6e0cdaee7db069be5d8d896bb59bdcb15673e9` | Validated against wirelog `v0.51.0` (peeled tag SHA); runtime minimum remains `0.44.0`. Bundled engine bumped to pick up the wirelog#914 single-body-rule derivation fix (#165). | The table grows with every release; the source of truth is the [CHANGELOG](https://github.com/semantic-reasoning/PyreWire/blob/main/CHANGELOG.md). diff --git a/pyproject.toml b/pyproject.toml index 6e3d721..17c067d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pyrewire" -version = "1.0.0" +version = "1.0.1" description = "Python wrapper for wirelog - declarative dataflow analysis" readme = "README.md" requires-python = ">=3.11" @@ -74,7 +74,7 @@ test-requires = ["pytest", "pytest-cov"] before-build = "python {project}/scripts/bundle_libwirelog.py" # Pin the wirelog source ref here too so the environment matches the # `WIRELOG_VERSION` used by the test-matrix workflow. -environment = { WIRELOG_VERSION = "272edf3a24b25676f12c4b843d55510f5048dd2f" } +environment = { WIRELOG_VERSION = "0c6e0cdaee7db069be5d8d896bb59bdcb15673e9" } [tool.cibuildwheel.linux] manylinux-x86_64-image = "manylinux_2_28" @@ -83,7 +83,7 @@ before-all = """ pip install meson && \ WIRELOG_PREFIX=/wirelog-install bash {project}/scripts/build_wirelog.sh """ -environment = { WIRELOG_VERSION = "272edf3a24b25676f12c4b843d55510f5048dd2f", WIRELOG_PREFIX = "/wirelog-install", WIRELOG_LIB = "/wirelog-install/lib/libwirelog.so.1", LD_LIBRARY_PATH = "/wirelog-install/lib" } +environment = { WIRELOG_VERSION = "0c6e0cdaee7db069be5d8d896bb59bdcb15673e9", WIRELOG_PREFIX = "/wirelog-install", WIRELOG_LIB = "/wirelog-install/lib/libwirelog.so.1", LD_LIBRARY_PATH = "/wirelog-install/lib" } # `auditwheel` bundles libwirelog.so.1 into the wheel and patches the # RPATH (#31). Without this every wheel would ship as a manylinux # wheel that immediately fails at import time on systems without the @@ -96,7 +96,7 @@ before-all = """ brew install ninja meson pkg-config && \ WIRELOG_PREFIX=$HOME/wirelog-install bash {project}/scripts/build_wirelog.sh """ -environment = { WIRELOG_VERSION = "272edf3a24b25676f12c4b843d55510f5048dd2f", WIRELOG_PREFIX = "$HOME/wirelog-install", WIRELOG_LIB = "$HOME/wirelog-install/lib/libwirelog.1.dylib", DYLD_LIBRARY_PATH = "$HOME/wirelog-install/lib" } +environment = { WIRELOG_VERSION = "0c6e0cdaee7db069be5d8d896bb59bdcb15673e9", WIRELOG_PREFIX = "$HOME/wirelog-install", WIRELOG_LIB = "$HOME/wirelog-install/lib/libwirelog.1.dylib", DYLD_LIBRARY_PATH = "$HOME/wirelog-install/lib" } # `delocate` is macOS's auditwheel equivalent — copies the dylib into # the wheel and rewrites install names so the bundled copy wins. repair-wheel-command = "DYLD_LIBRARY_PATH=$HOME/wirelog-install/lib delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}" @@ -104,7 +104,7 @@ repair-wheel-command = "DYLD_LIBRARY_PATH=$HOME/wirelog-install/lib delocate-whe [tool.cibuildwheel.windows] archs = ["AMD64"] before-all = "powershell {project}\\scripts\\build_wirelog.ps1" -environment = { WIRELOG_VERSION = "272edf3a24b25676f12c4b843d55510f5048dd2f", WIRELOG_PREFIX = "C:/wirelog-install", WIRELOG_LIB = "C:/wirelog-install/bin/wirelog-1.dll" } +environment = { WIRELOG_VERSION = "0c6e0cdaee7db069be5d8d896bb59bdcb15673e9", WIRELOG_PREFIX = "C:/wirelog-install", WIRELOG_LIB = "C:/wirelog-install/bin/wirelog-1.dll" } # `delvewheel` is the Windows analogue. The bundled DLL ends up in # `pyrewire/_lib/` and the loader (#2) finds it ahead of system paths. repair-wheel-command = "pip install delvewheel && delvewheel repair -w {dest_dir} --no-mangle-all --add-path C:/wirelog-install/bin {wheel}" diff --git a/src/pyrewire/__init__.py b/src/pyrewire/__init__.py index 4b78c0c..61c4ef2 100644 --- a/src/pyrewire/__init__.py +++ b/src/pyrewire/__init__.py @@ -1,6 +1,6 @@ """PyreWire - Python wrapper for wirelog declarative dataflow analysis.""" -__version__ = "1.0.0" +__version__ = "1.0.1" __author__ = "PyreWire Contributors" __license__ = "Apache-2.0 OR GPL-3.0-or-later" diff --git a/tests/docs/test_support_matrix.py b/tests/docs/test_support_matrix.py index 32a6f73..a7dfb0b 100644 --- a/tests/docs/test_support_matrix.py +++ b/tests/docs/test_support_matrix.py @@ -11,7 +11,7 @@ yaml = pytest.importorskip("yaml") -PINNED_WIRELOG_SHA = "272edf3a24b25676f12c4b843d55510f5048dd2f" +PINNED_WIRELOG_SHA = "0c6e0cdaee7db069be5d8d896bb59bdcb15673e9" SUPPORTED_PYTHONS = ["3.11", "3.12", "3.13", "3.14"] SUPPORTED_CP_TAGS = ["cp311", "cp312", "cp313", "cp314"] SUPPORTED_RUNNERS = ["ubuntu-24.04", "macos-15", "windows-2025-vs2026"] @@ -121,7 +121,7 @@ def test_support_wirelog_bundle_contract_matches_config_and_versioning(): assert cibw["macos"]["environment"]["WIRELOG_VERSION"] == PINNED_WIRELOG_SHA assert cibw["windows"]["environment"]["WIRELOG_VERSION"] == PINNED_WIRELOG_SHA - assert "wirelog v0.50.0" in support + assert "wirelog v0.51.0" in support assert PINNED_WIRELOG_SHA in support assert "peeled SHA" in support assert "Wheels bundle" in versioning diff --git a/tests/docs/test_versioning_contract.py b/tests/docs/test_versioning_contract.py index ae2d617..1ba2577 100644 --- a/tests/docs/test_versioning_contract.py +++ b/tests/docs/test_versioning_contract.py @@ -10,7 +10,11 @@ yaml = pytest.importorskip("yaml") -PINNED_WIRELOG_SHA = "272edf3a24b25676f12c4b843d55510f5048dd2f" +# The wirelog ref the current release bundles and validates against. +PINNED_WIRELOG_SHA = "0c6e0cdaee7db069be5d8d896bb59bdcb15673e9" +# Historical pins kept frozen in the compatibility table, one per release. +WIRELOG_SHA_100 = "272edf3a24b25676f12c4b843d55510f5048dd2f" +WIRELOG_SHA_101 = PINNED_WIRELOG_SHA def _repo_root() -> Path: @@ -32,12 +36,22 @@ def test_versioning_documents_100_wirelog_pin_and_runtime_floor(): minimum, validated_ref, notes = _versioning_row("1.0.0") assert minimum == "`0.44.0`" - assert validated_ref == f"`{PINNED_WIRELOG_SHA}`" + assert validated_ref == f"`{WIRELOG_SHA_100}`" assert "v0.50.0" in notes assert "runtime minimum remains `0.44.0`" in notes assert "peeled tag SHA" in notes +def test_versioning_documents_101_wirelog_pin_and_runtime_floor(): + minimum, validated_ref, notes = _versioning_row("1.0.1") + + assert minimum == "`0.44.0`" + assert validated_ref == f"`{WIRELOG_SHA_101}`" + assert "v0.51.0" in notes + assert "runtime minimum remains `0.44.0`" in notes + assert "peeled tag SHA" in notes + + def test_versioning_explains_sdist_and_wheel_wirelog_behavior(): text = _read("docs/versioning.md") @@ -49,7 +63,7 @@ def test_versioning_explains_sdist_and_wheel_wirelog_behavior(): assert "validated ref" in text -def test_wirelog_pins_and_loader_floor_match_100_contract(): +def test_wirelog_pins_and_loader_floor_match_current_contract(): pyproject = tomllib.loads(_read("pyproject.toml")) ci = yaml.safe_load(_read(".github/workflows/ci.yml")) loader = _read("src/pyrewire/_ffi/_loader.py") diff --git a/tests/test_changelog_format.py b/tests/test_changelog_format.py index c53af47..2992204 100644 --- a/tests/test_changelog_format.py +++ b/tests/test_changelog_format.py @@ -163,11 +163,15 @@ def test_changelog_distinguishes_wirelog_runtime_floor_from_validated_ref(): ) -def test_100_release_compare_links_are_tag_to_tag(): +def test_release_compare_links_are_tag_to_tag(): changelog = (_repo_root() / "CHANGELOG.md").read_text(encoding="utf-8") assert ( - "[Unreleased]: https://github.com/semantic-reasoning/PyreWire/compare/v1.0.0...HEAD" + "[Unreleased]: https://github.com/semantic-reasoning/PyreWire/compare/v1.0.1...HEAD" + in changelog + ) + assert ( + "[1.0.1]: https://github.com/semantic-reasoning/PyreWire/compare/v1.0.0...v1.0.1" in changelog ) assert ( diff --git a/tests/test_ci_workflow.py b/tests/test_ci_workflow.py index 161ed8a..4b97010 100644 --- a/tests/test_ci_workflow.py +++ b/tests/test_ci_workflow.py @@ -23,7 +23,7 @@ def _workflow() -> dict[str, Any]: def test_ci_default_wirelog_version_is_exact_sha(): env = _workflow()["jobs"]["test"]["env"] default = str(env["WIRELOG_VERSION"]) - assert "272edf3a24b25676f12c4b843d55510f5048dd2f" in default + assert "0c6e0cdaee7db069be5d8d896bb59bdcb15673e9" in default def test_ci_matrix_drops_python_310(): diff --git a/tests/test_release_metadata.py b/tests/test_release_metadata.py index 30d13b2..e36a373 100644 --- a/tests/test_release_metadata.py +++ b/tests/test_release_metadata.py @@ -27,9 +27,9 @@ def _runtime_version_literal() -> str: return match.group(1) -def test_project_and_runtime_versions_are_100(): - assert _pyproject()["project"]["version"] == "1.0.0" - assert _runtime_version_literal() == "1.0.0" +def test_project_and_runtime_versions_are_101(): + assert _pyproject()["project"]["version"] == "1.0.1" + assert _runtime_version_literal() == "1.0.1" def test_project_classifiers_mark_stable_python_311_through_314():