platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 01:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

PackageManifest: Ignore hidden files for examples

Browse Source
This commit is contained in:
Ivan Kravets
2019-10-02 20:42:01 +03:00
parent 47ba127733
commit e6ea4cb613
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.readthedocs.yml
View File

@ -2,8 +2,5 @@
version: 2 version: 2
sphinx:
configuration: docs/conf.py
formats: formats:
- pdf - pdf

2
platformio/package/manifest/model.py
View File

@ -42,7 +42,7 @@ class ExportModel(DataModel):
class ExampleModel(DataModel): class ExampleModel(DataModel):
name = DataField(max_length=100, regex=r"^[a-zA-Z\d\-\_ ]+$", required=True) name = DataField(max_length=100, regex=r"^[a-zA-Z\d\-\_/ ]+$", required=True)
base = DataField(required=True) base = DataField(required=True)
files = DataField(type=ListOfType(DataField())) files = DataField(type=ListOfType(DataField()))

5
platformio/package/manifest/parser.py
View File

@ -180,6 +180,11 @@ class BaseManifestParser(object):
result = {} result = {}
last_pio_project = None last_pio_project = None
for root, _, files in os.walk(examples_dir): for root, _, files in os.walk(examples_dir):
# skip hidden files and folders
files = [f for f in files if not f.startswith(".")]
if os.path.basename(root).startswith(".") or not files:
continue
if is_platformio_project(root): if is_platformio_project(root):
last_pio_project = root last_pio_project = root
result[last_pio_project] = dict( result[last_pio_project] = dict(

2
tests/test_pkgmanifest.py
View File

@ -432,6 +432,7 @@ def test_examples_from_dir(tmpdir_factory):
# PlatformIO project #1 # PlatformIO project #1
pio_dir = examples_dir.mkdir("PlatformIO").mkdir("hello") pio_dir = examples_dir.mkdir("PlatformIO").mkdir("hello")
pio_dir.join(".vimrc").write("")
pio_dir.join("platformio.ini").write("") pio_dir.join("platformio.ini").write("")
pio_dir.mkdir("include").join("main.h").write("") pio_dir.mkdir("include").join("main.h").write("")
pio_dir.mkdir("src").join("main.cpp").write("") pio_dir.mkdir("src").join("main.cpp").write("")
@ -470,6 +471,7 @@ def test_examples_from_dir(tmpdir_factory):
data["examples"] = _sort_examples(data["examples"]) data["examples"] = _sort_examples(data["examples"])
model = ManifestModel(**data) model = ManifestModel(**data)
assert model.examples[0].name == "PlatformIO/hello"
assert model == ManifestModel( assert model == ManifestModel(
**{ **{
"version": "1.0.0", "version": "1.0.0",