idf-build-apps 1.0.0rc0__py2.py3-none-any.whl → 1.0.1__py2.py3-none-any.whl

idf_build_apps/__init__.py

@@ -7,7 +7,7 @@ Tools for building ESP-IDF related apps.
 
 import logging
 
-__version__ = '1.0.0.rc0'
+__version__ = '1.0.1'
 
 LOGGER = logging.getLogger('idf_build_apps')
 

idf_build_apps/finder.py

@@ -17,6 +17,7 @@ from .app import (
 )
 from .utils import (
     config_rules_from_str,
+    to_absolute_path,
     to_list,
 )
 
@@ -165,15 +166,18 @@ def _find_apps(
 
     # The remaining part is for recursive == True
     apps = []
+    # handle the exclude list, since the config file might use linux style, but run in windows
+    exclude_list = [to_absolute_path(p) for p in exclude_list]
     for root, dirs, _ in os.walk(path):
         LOGGER.debug('Entering %s', root)
-        if root in exclude_list:
+        root_path = to_absolute_path(root)
+        if root_path in exclude_list:
             LOGGER.debug('=> Skipping %s (excluded)', root)
             del dirs[:]
             continue
 
-        if root.endswith('managed_components'):  # idf-component-manager
-            LOGGER.debug('=> Skipping %s (managed components)', root)
+        if root_path.parts[-1] == 'managed_components':  # idf-component-manager
+            LOGGER.debug('=> Skipping %s (managed components)', root_path)
             del dirs[:]
             continue
 

idf_build_apps/main.py

@@ -498,11 +498,7 @@ def get_parser():  # type: () -> argparse.ArgumentParser
         action='store_true',
         help='Look for apps in the specified paths recursively',
     )
-    common_args.add_argument(
-        '--exclude',
-        nargs='+',
-        help='Ignore specified directory (if --recursive is given)',
-    )
+    common_args.add_argument('--exclude', nargs='+', help='Ignore specified path (if --recursive is given)')
     common_args.add_argument(
         '--work-dir',
         help='If set, the app is first copied into the specified directory, and then built. '
@@ -588,10 +584,9 @@ def get_parser():  # type: () -> argparse.ArgumentParser
         '--ignore-app-dependencies-filepatterns',
         nargs='*',
         default=None,
-        help='space-separated list which specifies the file patterns used for ignoring the component dependencies. '
-        'The `depends_components` and `depends_filepatterns` set in the manifest files will be ignored when any of '
-        'the specified file patterns matches any of the modified files. Must be used together with '
-        '--modified-files',
+        help='space-separated list which specifies the file patterns used for ignoring checking the app dependencies. '
+        'The `depends_components` and `depends_filepatterns` set in the manifest files will be ignored when any of the '
+        'specified file patterns matches any of the modified files. Must be used together with --modified-files',
     )
 
     common_args.add_argument(

idf_build_apps/utils.py

@@ -23,6 +23,12 @@ except ImportError:
     pass
 
 
+if sys.version_info < (3, 5):
+    import glob2 as glob
+else:
+    import glob
+
+
 class ConfigRule:
     def __init__(self, file_name, config_name):  # type: (str, str) -> None
         """
@@ -213,14 +219,17 @@ def files_matches_patterns(
     patterns,  # type: list[str] | str
     rootpath=None,  # type: str
 ):  # type: (...) -> bool
-    # can't match a absolute pattern with a relative path
+    # can't match an absolute pattern with a relative path
     # change all to absolute paths
     files = [to_absolute_path(f, rootpath) for f in to_list(files)]
     patterns = [to_absolute_path(p, rootpath) for p in to_list(patterns)]
 
+    matched_paths = set()
+    for pat in patterns:
+        matched_paths.update(glob.glob(str(pat), recursive=True))
+
     for f in files:
-        for p in patterns:
-            if f.match(str(p)):
-                return True
+        if str(f) in matched_paths:
+            return True
 
     return False

{idf_build_apps-1.0.0rc0.dist-info → idf_build_apps-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: idf-build-apps
-Version: 1.0.0rc0
+Version: 1.0.1
 Summary: Tools for building ESP-IDF related apps.
 Author-email: Fu Hanxi <fuhanxi@espressif.com>
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: pathlib; python_version < '3.4'
+Requires-Dist: glob2; python_version < '3.5'
 Requires-Dist: pyparsing
 Requires-Dist: pyyaml
 Requires-Dist: packaging

{idf_build_apps-1.0.0rc0.dist-info → idf_build_apps-1.0.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-idf_build_apps/__init__.py,sha256=lpGd8b4wdPa8oPqh3bqh3tZsHOxjiGkcRJmdOK-NgLQ,485
+idf_build_apps/__init__.py,sha256=lb-890PZ2eRFvHtV8eCV3AmAl3oE7nrDN7kDsu9SaVw,481
 idf_build_apps/__main__.py,sha256=8E-5xHm2MlRun0L88XJleNh5U50dpE0Q1nK5KqomA7I,182
 idf_build_apps/app.py,sha256=sNUWNJs9JrBjzzIDajpR7W0oEu6oc1oQls-jTxK9_ag,26619
 idf_build_apps/config.py,sha256=FCr1oqk8OJLNXUKxuIi4aJRWaRYalubOzQEQ0YCY2kk,2794
 idf_build_apps/constants.py,sha256=E3YHqfvR1gb1ppWQ17QSrHQOJjclBVxd-xjTCXJdz9Q,2187
-idf_build_apps/finder.py,sha256=P-97-wKfcSnSy3Mb5VYhNiihJ1noMqE_T8s7I2lnkew,6087
+idf_build_apps/finder.py,sha256=Z0UBMAoJrInQofx3BgVJ9g1QDqzidnz0VI9Qevq2B5g,6328
 idf_build_apps/log.py,sha256=cmofQmHralhTeaM7d3aOScgYm8Swt-pveZ_h1P_PVcs,2220
-idf_build_apps/main.py,sha256=wMoe5PU3aFJepSzQtuG5ygNVhEADT6o1Sq9KqZAWZ80,30651
-idf_build_apps/utils.py,sha256=5pAbbMOY6g5lKKryyBRfI3xwiepKsw7tG-zkCva-r4Q,6577
+idf_build_apps/main.py,sha256=DYE8Ihc8ZbH88ev4XqzY0z9xFJOrkehY33-UyYAEIZs,30607
+idf_build_apps/utils.py,sha256=ZXv8mtRpLwZCoLWeP-vjGs7xyfX4m6PnRShRm36G0-w,6748
 idf_build_apps/manifest/__init__.py,sha256=Q2-cb3ngNjnl6_zWhUfzZZB10f_-Rv2JYNck3Lk7UkQ,133
 idf_build_apps/manifest/if_parser.py,sha256=nFaaTGeEpM5ZrCZlASOAeYe_IpOwJ8zfZmvnEWNYFAE,6321
 idf_build_apps/manifest/manifest.py,sha256=K8T3vcPeD08DScDTpPahfcpjZgm2zIEcnx7b_k0djb8,5956
 idf_build_apps/manifest/soc_header.py,sha256=EMre7yIzWyfriW6Lwx8Cho4zikXrbY-wluCDoVAGcAk,3423
-idf_build_apps-1.0.0rc0.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
-idf_build_apps-1.0.0rc0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-idf_build_apps-1.0.0rc0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-idf_build_apps-1.0.0rc0.dist-info/METADATA,sha256=etKxKBbmMw984R33bTZ79GaR_qQq7go4eGYwnKxdT1M,5498
-idf_build_apps-1.0.0rc0.dist-info/RECORD,,
+idf_build_apps-1.0.1.dist-info/entry_points.txt,sha256=3pVUirUEsb6jsDRikkQWNUt4hqLK2ci1HvW_Vf8b6uE,59
+idf_build_apps-1.0.1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+idf_build_apps-1.0.1.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+idf_build_apps-1.0.1.dist-info/METADATA,sha256=DENYCuua0nEi80QNynIjnyjxqQTnxXBe_w_XVh9Q4Q0,5540
+idf_build_apps-1.0.1.dist-info/RECORD,,