Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ inferrsi = ["apps/views/*.html"]

[tool.setuptools_scm]
version_file = "src/inferrsi/_version.py"
# Select release tags before parsing the version. Evidence tags share this history.
git_describe_command = """
git describe --dirty --tags --long --abbrev=40 \
--match v[0-9]*.[0-9]*.[0-9]* --exclude v*[!0-9.]* --exclude *.*.*.*
"""
tag_regex = '^v(?P<version>[0-9]+\.[0-9]+\.[0-9]+)$'

[tool.inferrsi.release]
Expand Down
2 changes: 1 addition & 1 deletion tests/check_installed.py
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ def _inventory(root, prefix):
**_inventory(files("inferrsi").joinpath("knowledge", "data"), "knowledge/data"),
**_inventory(files("inferrsi").joinpath("harness", "data"), "harness/data"),
}
assert len(inventory) == 927, f"installed resource count is {len(inventory)}, expected 927"
assert len(inventory) == 928, f"installed resource count is {len(inventory)}, expected 928"
assert sum(name.startswith("harness/data/") for name in inventory) == len(REPO_TYPES)
# Every pinned record path and every registered skill body resolves inside that
# same enumeration, so the inventory and the records describe one resource set.
Expand Down
26 changes: 24 additions & 2 deletions tests/test_release.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
import io
import shlex
import subprocess
import tarfile
from pathlib import Path

import pytest

from tools.check_release import check_sdist, check_versions, plan_release, release_version

try:
import tomllib
except ModuleNotFoundError:
import tomli as tomllib


@pytest.mark.parametrize("tag", ["v0.1.0", "v1.2.3", "v10.20.30"])
def test_stable_release_versions(tag):
Expand Down Expand Up @@ -46,14 +53,29 @@ def published(tag="v0.1.0", draft=False, prerelease=False):


def change_source(git):
from pathlib import Path

Path("source.txt").write_text("changed", encoding="utf-8")
git("add", "source.txt")
git("commit", "-m", "change")
git("update-ref", "refs/remotes/origin/main", "HEAD")


def test_wheel_version_discovery_ignores_nearer_nonrelease_tags(release_repo):
git = release_repo
project = Path(__file__).resolve().parents[1] / "pyproject.toml"
with project.open("rb") as stream:
scm = tomllib.load(stream)["tool"]["setuptools_scm"]
command = shlex.split(scm["git_describe_command"])

git("tag", "v1.2.3")
assert git(*command[1:]).startswith("v1.2.3-0-g")
change_source(git)
git("tag", "-a", "evidence-candidate-v1", "-m", "retained evidence")
git("tag", "-a", "v9.0.0rc1", "-m", "prerelease")
git("tag", "-a", "v9.0.0.1", "-m", "extra version component")
assert git("describe", "--tags").startswith(("evidence-", "v9."))
assert git(*command[1:]).startswith("v1.2.3-1-g")


def test_bootstrap_without_existing_tags(release_repo):
plan = plan_release("main", [], "0.1.0")
assert plan == {"release": "true", "tag": "v0.1.0",
Expand Down
Loading