Merge branch 'release/0.0.8'

Author: cnheider

.github/images/octocat.svg

@@ -1,10 +1,10 @@
 fail_fast: true
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.6.0
+    rev: 23.3.0
     hooks:
       - id: black
-        language_version: python3.8
+        language_version: python3.10
   - repo: local
     hooks:
       - id: pytest-check

.pre-commit-config.yaml

@@ -3,14 +3,13 @@
 import datetime
 import os
 from warnings import warn
-
-import pkg_resources
-
+from importlib.metadata import PackageNotFoundError
+from importlib import resources
 from apppath import AppPath
 
 __project__ = "devpack"
 __author__ = "Christian Heider Nielsen"
-__version__ = "0.0.7"
+__version__ = "0.0.8"
 __doc__ = """
 Created on 15/04/2020
 
@@ -31,32 +30,20 @@
     # "PACKAGE_DATA_PATH"
 ]
 
-
-def dist_is_editable(dist: Any) -> bool:
-    """
-    Return True if given Distribution is an editable installation."""
-    import sys
-    from pathlib import Path
-
-    for path_item in sys.path:
-        egg_link = Path(path_item) / f"{dist.project_name}.egg-link"
-        if egg_link.is_file():
-            return True
-    return False
-
-
 PROJECT_NAME = __project__.lower().strip().replace(" ", "_")
 PROJECT_VERSION = __version__
 PROJECT_YEAR = 2018
 PROJECT_AUTHOR = __author__.lower().strip().replace(" ", "_")
 PROJECT_APP_PATH = AppPath(app_name=PROJECT_NAME, app_author=PROJECT_AUTHOR)
 PROJECT_ORGANISATION = "pything"
 
-distributions = {v.key: v for v in pkg_resources.working_set}
-if PROJECT_NAME in distributions:
-    distribution = distributions[PROJECT_NAME]
-    DEVELOP = dist_is_editable(distribution)
-else:
+from warg import package_is_editable
+
+PACKAGE_DATA_PATH = resources.files(PROJECT_NAME) / "data"
+
+try:
+    DEVELOP = package_is_editable(PROJECT_NAME)
+except PackageNotFoundError as e:
     DEVELOP = True
 
 

devpack/__init__.py

@@ -18,3 +18,4 @@
 # from .shebangs import *
 # from .entry_points import *
 # from .authors import *
+# from .typing_hints import *

devpack/batch_tools/__init__.py

@@ -14,7 +14,7 @@
 from pathlib import Path
 from typing import Iterable, Callable, Optional, Sequence, Mapping, List
 
-from warg.os_utilities.filtering import negate, is_python_module, is_python_package
+from warg.os_utilities.filtering import negate, is_python_package
 
 
 def has_import_aliases(path: Path, *, verbose: bool = False) -> bool:

devpack/batch_tools/aliases.py

@@ -245,6 +245,10 @@ def check_alls(path: Path, *, verbose: bool = True) -> None:
                     print("WARNING library file with empty __all__ declaration")
 
 
+def has_multiple_alls() -> bool:
+    ...
+
+
 def recursive_check_alls(
     path: Path,
     exclusion_filter: Optional[Iterable[Callable]] = (negate(is_python_package),),
@@ -270,7 +274,6 @@ def recursive_check_alls(
             if exclusion_filter is None or not any(
                 flt(child) for flt in exclusion_filter
             ):
-
                 recursive_check_alls(
                     child,
                     exclusion_filter,

devpack/batch_tools/alls.py

@@ -15,6 +15,7 @@
 from typing import Optional, Callable, Iterable
 
 from draugr.os_utilities.linux_utilities.user_utilities import get_username
+
 from warg.os_utilities.filtering import is_python_module, negate
 
 

devpack/batch_tools/privates.py

@@ -14,6 +14,7 @@
 from typing import Callable, Iterable, Optional
 
 from sorcery import assigned_names
+
 from warg.os_utilities.filtering import negate, is_python_package
 
 

devpack/batch_tools/readmes.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+__author__ = "heider"
+__doc__ = r"""
+
+           Created on 9/6/22
+           """
+
+__all__ = ["is_missing_typing_hints"]
+
+import subprocess
+from pathlib import Path
+from typing import Optional, Iterable, Callable, Sequence
+
+
+def is_missing_typing_hints(
+    path: Path,
+    *,
+    verbose: bool = True,
+    flags: Optional[Sequence] = (
+        "--disallow-untyped-calls ",
+        "--disallow-untyped-defs ",
+        "--disallow-incomplete-defs ",
+        "--strict-optional",
+        "--strict",
+    ),
+) -> bool:
+    """
+
+    :param verbose:
+    :type verbose:
+    :param path:
+    :type path:
+    :return:
+    :rtype:
+    """
+    a = subprocess.getoutput(f'mypy {" ".join(flags)} {str(path)}')
+    if verbose:
+        print(a)
+    if "Success:" not in a:
+        return True
+    return False
+
+
+def is_missing_typing_hints_traverse(
+    path: Path,
+    exclusion_filter: Optional[Iterable[Callable]] = None,
+    *,
+    verbose: bool = True,
+):
+    """
+
+    :param path:
+    :type path:
+    :param exclusion_filter:
+    :type exclusion_filter:
+    :param init_name:
+    :type init_name:
+    :param verbose:
+    :type verbose:
+    """
+    path = Path(path)
+
+    for child in path.iterdir():
+        if child.is_dir():
+            if exclusion_filter is None or not any(
+                flt(child) for flt in exclusion_filter
+            ):
+                is_missing_typing_hints_traverse(
+                    child, exclusion_filter=exclusion_filter, 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():
+            if is_missing_typing_hints(
+                child,
+                verbose=verbose,
+            ):
+                break
+
+
+if __name__ == "__main__":
+    print(is_missing_typing_hints(Path(__file__).parent))

devpack/batch_tools/typing_hints.py

@@ -12,8 +12,8 @@
 import argparse
 from pathlib import Path
 
-from devpack.batch_tools.readmes import TouchModeEnum, recursive_add_readmes
 from devpack.batch_tools.inits import recursive_remove_inits
+from devpack.batch_tools.readmes import TouchModeEnum, recursive_add_readmes
 
 
 def recursively_add_readmes_from_here():
@@ -71,6 +71,27 @@ def recursively_remove_inits_from_here():
     )
 
 
+def recursively_check_typing():
+    """
+    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(
+        "--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()
+    # recursively_add_readmes_from_here()
+    # recursively_remove_inits_from_here()
+    recursively_check_typing()