fastcore 2.2.27__tar.gz → 2.2.28__tar.gz

{fastcore-2.2.27/fastcore.egg-info → fastcore-2.2.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.2.27
+Version: 2.2.28
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0
@@ -88,6 +88,8 @@ To install fastcore run: `conda install fastcore -c fastai` (if you use Anaconda
 
 To get started, we recommend you read through [the fastcore tour](https://fastcore.fast.ai/tour.html).
 
+[`globtastic`](https://fastcore.fast.ai/xtras.html#globtastic) supports filename filters (`file_glob`, `file_re`) and full-path filters (`path_glob`, `path_re`). Glob filters use `fnmatch`: `*` matches directory separators and `**` has no special meaning.
+
 ## Contributing
 
 After you clone this repository, please run `nbdev_install_hooks` in your terminal. This sets up git hooks, which clean up the notebooks to remove the extraneous stuff stored in the notebooks (e.g. which cells you ran) which causes unnecessary merge conflicts.

{fastcore-2.2.27 → fastcore-2.2.28}/README.md

@@ -57,6 +57,8 @@ To install fastcore run: `conda install fastcore -c fastai` (if you use Anaconda
 
 To get started, we recommend you read through [the fastcore tour](https://fastcore.fast.ai/tour.html).
 
+[`globtastic`](https://fastcore.fast.ai/xtras.html#globtastic) supports filename filters (`file_glob`, `file_re`) and full-path filters (`path_glob`, `path_re`). Glob filters use `fnmatch`: `*` matches directory separators and `**` has no special meaning.
+
 ## Contributing
 
 After you clone this repository, please run `nbdev_install_hooks` in your terminal. This sets up git hooks, which clean up the notebooks to remove the extraneous stuff stored in the notebooks (e.g. which cells you ran) which causes unnecessary merge conflicts.

{fastcore-2.2.27 → fastcore-2.2.28}/fastcore/__init__.py

@@ -55,4 +55,4 @@ Modules:
 - `fastcore.xml`: Concise HTML generation and namespace-aware XML construction.
 - `fastcore.xtras`: Utility functions used in the fastai library"""
 
-__version__ = "2.2.27"
+__version__ = "2.2.28"

{fastcore-2.2.27 → fastcore-2.2.28}/fastcore/xtras.py

@@ -138,6 +138,8 @@ def globtastic(
     symlinks:bool=True, # follow symlinks?
     file_glob:str=None, # Only include files matching glob
     file_re:str=None, # Only include files matching regex
+    path_glob:str=None, # Only include files whose full paths match glob (wildcards match separators)
+    path_re:str=None, # Only include files whose full paths match regex
     folder_re:str=None, # Only enter folders matching regex
     skip_file_glob:str=None, # Skip files matching glob
     skip_file_re:str=None, # Skip files matching regex
@@ -158,10 +160,13 @@ def globtastic(
     if exts:
         exts = [e if e.startswith('.') else f'.{e}' for e in listify(exts)]
         file_re = f"({'|'.join(re.escape(e) for e in exts)})$"
-    file_re,folder_re = compile_re(file_re),compile_re(folder_re)
+    file_re,folder_re,path_re = compile_re(file_re),compile_re(folder_re),compile_re(path_re)
     skip_file_re,skip_folder_re = compile_re(skip_file_re),compile_re(skip_folder_re)
     def _keep_file(root, name):
-        return (not file_glob or fnmatch(name, file_glob)) and (
+        fname = os.path.join(root,name)
+        return (not path_glob or fnmatch(fname, path_glob)) and (
+                not path_re or path_re.search(fname)) and (
+                not file_glob or fnmatch(name, file_glob)) and (
                 not file_re or file_re.search(name)) and (
                 not skip_file_glob or not fnmatch(name, skip_file_glob)) and (
                 not skip_file_re or not skip_file_re.search(name))

{fastcore-2.2.27 → fastcore-2.2.28/fastcore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.2.27
+Version: 2.2.28
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0
@@ -88,6 +88,8 @@ To install fastcore run: `conda install fastcore -c fastai` (if you use Anaconda
 
 To get started, we recommend you read through [the fastcore tour](https://fastcore.fast.ai/tour.html).
 
+[`globtastic`](https://fastcore.fast.ai/xtras.html#globtastic) supports filename filters (`file_glob`, `file_re`) and full-path filters (`path_glob`, `path_re`). Glob filters use `fnmatch`: `*` matches directory separators and `**` has no special meaning.
+
 ## Contributing
 
 After you clone this repository, please run `nbdev_install_hooks` in your terminal. This sets up git hooks, which clean up the notebooks to remove the extraneous stuff stored in the notebooks (e.g. which cells you ran) which causes unnecessary merge conflicts.