forked from platformio/platformio-core
Added support for "owner" requirement when declaring `dependencies using library.json`
This commit is contained in:
1 parent
cd59c829e0
commit
c454ae336d
6 files changed
+23
-10
No files matched your search
@@ -80,7 +80,9 @@ class LibraryPackageManager(BasePackageManager): # pylint: disable=too-many-anc
|
||||
|
||||
def _install_dependency(self, dependency, silent=False):
|
||||
spec = PackageSpec(
|
||||
name=dependency.get("name"), requirements=dependency.get("version")
|
||||
owner=dependency.get("owner"),
|
||||
name=dependency.get("name"),
|
||||
requirements=dependency.get("version"),
|
||||
)
|
||||
search_filters = {
|
||||
key: value
|
||||
|
||||
@@ -388,7 +388,15 @@ class LibraryJsonManifestParser(BaseManifestParser):
|
||||
raw = [raw]
|
||||
|
||||
if isinstance(raw, dict):
|
||||
return [dict(name=name, version=version) for name, version in raw.items()]
|
||||
result = []
|
||||
for name, version in raw.items():
|
||||
if "/" in name:
|
||||
owner, name = name.split("/", 1)
|
||||
result.append(dict(owner=owner, name=name, version=version))
|
||||
else:
|
||||
result.append(dict(name=name, version=version))
|
||||
return result
|
||||
|
||||
if isinstance(raw, list):
|
||||
for i, dependency in enumerate(raw):
|
||||
if isinstance(dependency, dict):
|
||||
|
||||
@@ -106,6 +106,7 @@ class RepositorySchema(StrictSchema):
|
||||
|
||||
|
||||
class DependencySchema(StrictSchema):
|
||||
owner = fields.Str(validate=validate.Length(min=1, max=100))
|
||||
name = fields.Str(required=True, validate=validate.Length(min=1, max=100))
|
||||
version = fields.Str(validate=validate.Length(min=1, max=100))
|
||||
authors = StrictListField(fields.Str(validate=validate.Length(min=1, max=50)))
|
||||
|
||||
Reference in new issue
Block a user