platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-09-25 21:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved an issue where the |LDF| couldn't locate a library dependency declared via version control system repository // Resolve #4885

Browse Source
This commit is contained in:
Ivan Kravets
2024-03-26 13:44:26 +02:00
parent 2bad42ecb1
commit c475578db6
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.rst
View File

@@ -18,6 +18,11 @@ Unlock the true potential of embedded software development with
PlatformIO's collaborative ecosystem, embracing declarative principles, PlatformIO's collaborative ecosystem, embracing declarative principles,
test-driven methodologies, and modern toolchains for unrivaled success. test-driven methodologies, and modern toolchains for unrivaled success.
6.1.15 (2024-??-??)
~~~~~~~~~~~~~~~~~~~
* Resolved an issue where the |LDF| couldn't locate a library dependency declared via version control system repository (`issue #4885 <https://github.com/platformio/platformio-core/issues/4885>`_)
6.1.14 (2024-03-21) 6.1.14 (2024-03-21)
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~

16
platformio/builder/tools/piolib.py
View File

@@ -39,7 +39,7 @@ from platformio.package.manifest.parser import (
ManifestParserError, ManifestParserError,
ManifestParserFactory, ManifestParserFactory,
) )
from platformio.package.meta import PackageCompatibility, PackageItem from platformio.package.meta import PackageCompatibility, PackageItem, PackageSpec
from platformio.project.options import ProjectOptions from platformio.project.options import ProjectOptions
@@ -332,9 +332,17 @@ class LibBuilderBase:
qualifiers = {"name": pkg.metadata.name, "version": pkg.metadata.version} qualifiers = {"name": pkg.metadata.name, "version": pkg.metadata.version}
if pkg.metadata.spec and pkg.metadata.spec.owner: if pkg.metadata.spec and pkg.metadata.spec.owner:
qualifiers["owner"] = pkg.metadata.spec.owner qualifiers["owner"] = pkg.metadata.spec.owner
return PackageCompatibility.from_dependency( dep_qualifiers = {
{k: v for k, v in dependency.items() if k in ("owner", "name", "version")} k: v for k, v in dependency.items() if k in ("owner", "name", "version")
).is_compatible(PackageCompatibility(**qualifiers)) }
if (
"version" in dep_qualifiers
and not PackageSpec(dep_qualifiers["version"]).requirements
):
del dep_qualifiers["version"]
return PackageCompatibility.from_dependency(dep_qualifiers).is_compatible(
PackageCompatibility(**qualifiers)
)
def get_search_files(self): def get_search_files(self):
return [ return [