Merge branch 'release/0.0.6'

Author: cnheider

.github/workflows/publish-to-test-pypi.yml

@@ -9,7 +9,7 @@ on: push
 jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
       - name: Set up Python 3.8

devpack/__init__.py

@@ -10,7 +10,7 @@
 
 __project__ = "devpack"
 __author__ = "Christian Heider Nielsen"
-__version__ = "0.0.5"
+__version__ = "0.0.6"
 __doc__ = """
 Created on 15/04/2020
 

devpack/batch_tools/__init__.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+__author__ = "heider"
+__doc__ = r"""
+
+           Created on 8/30/22
+           """
+
+__all__ = []

devpack/batch_tools/inits.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+__author__ = "heider"
+__doc__ = r"""
+
+           Created on 8/30/22
+           """
+
+__all__ = []
+
+from pathlib import Path
+from typing import Callable, Iterable, Optional
+
+from warg.os.filtering import negate, is_python_package
+
+
+def recursive_remove_inits(
+    path: Path,
+    exclusion_filter: Optional[Iterable[Callable]] = (negate(is_python_package),),
+    *,
+    init_name: str = "__init__.py",
+    verbose: bool = True,
+):
+    path = Path(path)
+
+    init_file = path / init_name
+    if init_file.exists():
+        init_file.unlink()
+
+    for child in path.iterdir():
+        if child.is_dir():
+            if exclusion_filter is None or not any(
+                flt(child) for flt in exclusion_filter
+            ):
+                recursive_remove_inits(
+                    child,
+                    exclusion_filter,
+                    init_name=init_name,
+                    verbose=verbose,
+                )
+            else:
+                if verbose:
+                    print(
+                        f"{child} was excluded, filters:\n{[(flt.__name__, flt(child)) for flt in exclusion_filter]}"
+                    )
+        elif child.is_file():
+            pass
+
+
+if __name__ == "__main__":
+    recursive_remove_inits("../exclude/samples")

devpack/batch_tools.py devpack/batch_tools/readmes.pydevpack/batch_tools.py renamed to devpack/batch_tools/readmes.py

@@ -14,6 +14,7 @@
 from typing import Callable, Iterable, Optional
 
 from sorcery import assigned_names
+from warg.os.filtering import negate, is_python_package
 
 
 class TouchModeEnum(Enum):
@@ -32,10 +33,13 @@ def auto_add_readme(
     readme_name: str = "README.md",
     root_path: Optional[Path] = Path.cwd(),
     prefix="# ",
+    verbose: bool = True,
 ) -> None:
     """
     Add a readme to the root_path if it does not exist
 
+    :param verbose:
+    :type verbose:
     :param path:
     :param touch_mode:
     :param readme_name:
@@ -48,6 +52,8 @@ def auto_add_readme(
     readme_file = path / readme_name
     if not readme_file.exists():
         readme_file.touch()
+        if verbose:
+            print(f"Created {readme_file}")
         if touch_mode == TouchModeEnum.breadcrumb:
             assert root_path is not None
             readme_file.write_text(prefix + str(path.relative_to(root_path)))
@@ -57,27 +63,9 @@ def auto_add_readme(
             readme_file.write_text(prefix + str(readme_file.parent.name))
         else:
             raise ValueError(f"Unknown touch mode {touch_mode}")
-
-
-def is_python_module(path: Path) -> bool:
-    """
-    Check if path is a python module
-    """
-    return path.is_file() and path.suffix == ".py"
-
-
-def is_python_package(path: Path) -> bool:
-    """
-    Check if path is a python package
-    """
-    return path.is_dir() and (path / "__init__.py").exists()
-
-
-def negate(f: Callable) -> Callable:
-    """
-    Negate a function
-    """
-    return lambda *args, **kwargs: not f(*args, **kwargs)
+    else:
+        if verbose:
+            print(f"{readme_name} already exists at {path}")
 
 
 def recursive_add_readmes(
@@ -87,6 +75,7 @@ def recursive_add_readmes(
     touch_mode: TouchModeEnum = TouchModeEnum.breadcrumb,
     readme_name: str = "README.md",
     root_path: Optional[Path] = None,
+    verbose: bool = True,
 ) -> None:
     """
     recursively add readmes to all children spanning from root_path
@@ -97,22 +86,34 @@ def recursive_add_readmes(
         root_path = path.parent
 
     auto_add_readme(
-        path, touch_mode=touch_mode, readme_name=readme_name, root_path=root_path
+        path,
+        touch_mode=touch_mode,
+        readme_name=readme_name,
+        root_path=root_path,
+        verbose=verbose,
     )
 
     for child in path.iterdir():
-        if exclusion_filter is None or not any(flt(child) for flt in exclusion_filter):
-            if child.is_dir():
+        if child.is_dir():
+            if exclusion_filter is None or not any(
+                flt(child) for flt in exclusion_filter
+            ):
                 recursive_add_readmes(
                     child,
                     exclusion_filter,
                     touch_mode=touch_mode,
                     readme_name=readme_name,
                     root_path=root_path,
+                    verbose=verbose,
                 )
-            elif child.is_file():
-                pass
+            else:
+                if verbose:
+                    print(
+                        f"{child} was excluded, filters:\n{[(flt.__name__, flt(child)) for flt in exclusion_filter]}"
+                    )
+        elif child.is_file():
+            pass
 
 
 if __name__ == "__main__":
-    recursive_add_readmes("exclude")
+    recursive_add_readmes("../exclude")

devpack/entry_points/batch.py

@@ -12,7 +12,8 @@
 import argparse
 from pathlib import Path
 
-from devpack.batch_tools import TouchModeEnum, recursive_add_readmes
+from devpack.batch_tools.readmes import TouchModeEnum, recursive_add_readmes
+from devpack.batch_tools.inits import recursive_remove_inits
 
 
 def recursively_add_readmes_from_here():
@@ -33,12 +34,43 @@ def recursively_add_readmes_from_here():
     parser.add_argument(
         "--readme-name", "-r", type=str, default="README.md", help="Readme name"
     )
+    parser.add_argument(
+        "--verbose", action="store_true", help="Verbose output of touched files"
+    )
     args = parser.parse_args()
 
     recursive_add_readmes(
-        args.path, touch_mode=args.touch_mode, readme_name=args.readme_name
+        args.path,
+        touch_mode=args.touch_mode,
+        readme_name=args.readme_name,
+        verbose=args.verbose,
+    )
+
+
+def recursively_remove_inits_from_here():
+    """
+    Add readmes to all python modules in the current directory
+    """
+    parser = argparse.ArgumentParser(description="DevPack remove inits from here")
+    parser.add_argument(
+        "--path", "-p", type=Path, default=Path.cwd(), help="Path to remove inits from"
+    )
+
+    parser.add_argument(
+        "--init-name", "-r", type=str, default="__init__.py", help="init name"
+    )
+    parser.add_argument(
+        "--verbose", action="store_true", help="Verbose output of removed files"
+    )
+    args = parser.parse_args()
+
+    recursive_remove_inits(
+        args.path,
+        init_name=args.init_name,
+        verbose=args.verbose,
     )
 
 
 if __name__ == "__main__":
     recursively_add_readmes_from_here()
+    recursively_remove_inits_from_here()

devpack/entry_points/cli.py

@@ -7,10 +7,8 @@
 
 import argparse
 
-from devpack.devpack.development import pip_uninstall_package
-
-
-from .development import pip_install_development_package
+from devpack.development import pip_uninstall_package
+from devpack.development import pip_install_development_package
 
 
 def install_develop():