forked from platformio/platformio-core
Merge branch 'develop' into feature/v7
This commit is contained in:
@ -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)
|
||||||
~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
@ -177,4 +177,4 @@ ATTRS{product}=="*CMSIS-DAP*", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID
|
|||||||
ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"
|
ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2107", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"
|
||||||
|
|
||||||
# Espressif USB JTAG/serial debug unit
|
# Espressif USB JTAG/serial debug unit
|
||||||
ATTRS{idVendor}=="303a", ATTR{idProduct}=="1001", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"
|
ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1", ENV{ID_MM_PORT_IGNORE}="1"
|
||||||
|
@ -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 [
|
||||||
|
Reference in New Issue
Block a user