[platformio] Accept git URLs passed as the library name (#17697)

This commit is contained in:
J. Nick Koston
2026-07-20 16:32:20 +12:00
committed by GitHub
parent dfb988c563
commit 76655cf951
3 changed files with 150 additions and 9 deletions
+78
View File
@@ -456,6 +456,84 @@ def test_node_key_git_no_ref():
assert locator == ("https://github.com/foo/bar.git", None)
def test_node_key_url_in_name_is_git():
# add_library("https://github.com/x/y", None): PlatformIO accepted a bare
# git URL as the library name, so the converter must too.
key, is_git, locator = _node_key(
"https://github.com/pstolarz/OneWireNg", None, None
)
assert key == "pstolarz/OneWireNg"
assert is_git is True
assert locator == ("https://github.com/pstolarz/OneWireNg", None)
def test_node_key_url_in_name_with_ref():
key, is_git, locator = _node_key(
"https://github.com/foo/bar.git#v1.2.3", None, None
)
assert (key, is_git, locator) == (
"foo/bar",
True,
("https://github.com/foo/bar.git", "v1.2.3"),
)
def test_node_key_url_in_name_git_plus_prefix():
key, is_git, locator = _node_key("git+https://github.com/foo/bar", None, None)
assert (key, is_git, locator) == (
"foo/bar",
True,
("https://github.com/foo/bar", None),
)
def test_node_key_git_plus_prefix_in_repository():
_key, is_git, locator = _node_key("name", None, "git+https://github.com/foo/bar")
assert (is_git, locator) == (True, ("https://github.com/foo/bar", None))
def test_node_key_custom_name_equals_url_is_git():
key, is_git, locator = _node_key(
"OneWireNg=https://github.com/pstolarz/OneWireNg", None, None
)
assert (key, is_git, locator) == (
"pstolarz/OneWireNg",
True,
("https://github.com/pstolarz/OneWireNg", None),
)
def test_node_key_url_in_name_with_query_containing_equals():
# A bare URL whose query string contains ``=`` must not be split by the
# CustomName=URL handling.
key, is_git, locator = _node_key("https://host/x/y.git?ref=main", None, None)
assert (key, is_git, locator) == (
"x/y",
True,
("https://host/x/y.git?ref=main", None),
)
@pytest.mark.parametrize("name", ["http://[::1", "CustomName=http://[::1"])
def test_node_key_malformed_url_in_name_raises(name: str) -> None:
# A name that was clearly meant to be a URL but does not parse must fail
# fast instead of degrading to a confusing registry lookup error.
with pytest.raises(RuntimeError, match="Invalid PIO library URL"):
_node_key(name, None, None)
def test_node_key_name_with_equals_but_no_url_is_registry():
key, is_git, locator = _node_key("FOO=BAR", "1.0", None)
assert (key, is_git, locator) == ("FOO=BAR", False, (None, "FOO=BAR"))
def test_node_key_version_url_still_ignored_when_name_plain():
# A version that is a URL is handled by the dependency walk, not here;
# a plain name must stay a registry spec regardless of version shape.
key, is_git, _locator = _node_key("bar", "https://github.com/foo/bar", None)
assert (key, is_git) == ("bar", False)
def test_node_key_registry_owner_name():
key, is_git, locator = _node_key("foo/bar", "^1.0.0", None)
assert (key, is_git, locator) == ("foo/bar", False, ("foo", "bar"))
@@ -212,6 +212,48 @@ def test_convert_libraries_handles_unparsable_dependency_version(tmp_path, monke
assert [d.name for d in top[0].dependencies] == ["C"]
@pytest.mark.parametrize(
("value", "expected"),
[
(None, None),
("", None),
("http://[::1", None), # malformed IPv6 makes urlsplit raise ValueError
("foo/bar", None),
("file:///no/host", None),
("https://github.com/x/y", "https://github.com/x/y"),
],
)
def test_url_or_none(value: str | None, expected: str | None) -> None:
assert lib._url_or_none(value) == expected
def test_convert_libraries_url_in_name_resolves_as_git(
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
) -> None:
# add_library("https://github.com/x/y", None) puts a git URL in the name
# position; it must resolve as a git source and never hit the registry.
_patch_download_with_manifests(
monkeypatch, tmp_path, {"pstolarz/OneWireNg": {"name": "OneWireNg"}}
)
def fail_registry(owner: str, pkgname: str, requirements: set[str]) -> None:
raise AssertionError(f"registry consulted for {owner}/{pkgname}")
# After the helper so this stub wins over the helper's benign one
monkeypatch.setattr(lib, "_resolve_registry_version", fail_registry)
top = convert_libraries(
[Library("https://github.com/pstolarz/OneWireNg", None, None)], _backend()
)
assert [c.name for c in top] == ["pstolarz/OneWireNg"]
assert top[0].data["name"] == "OneWireNg"
source = top[0].source
assert isinstance(source, GitSource)
assert source.url == "https://github.com/pstolarz/OneWireNg"
assert source.ref is None
def test_convert_libraries_skips_incompatible_dependency(tmp_path, monkeypatch):
# A dependency that declares an incompatible platform is skipped (the
# top-level library still builds).