version bumping

Author: cnheider

devpack/batch_tools/__init__.py

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

devpack/batch_tools/privates.py

@@ -15,7 +15,6 @@
 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/typing_hints.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/entry_points/batch.py

@@ -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()

devpack/entry_points/cli.py

@@ -12,7 +12,7 @@
 
 
 def install_develop():
-    """description"""
+    """For programmatically installing a package as a development install"""
     parser = argparse.ArgumentParser(description="DevPack Develop Installation")
     parser.add_argument(
         "PACKAGE_NAME", metavar="Name", type=str, help="Package name to install"
@@ -33,7 +33,7 @@ def install_develop():
 
 
 def uninstall():
-    """description"""
+    """For programmatically uninstalling a package"""
     parser = argparse.ArgumentParser(description="DevPack Uninstall")
     parser.add_argument(
         "PACKAGE_NAME", metavar="Name", type=str, help="Package name to uninstall"

devpack/entry_points/versioning.py

@@ -1,25 +1,18 @@
 import argparse
 from pathlib import Path
-from devpack.batch_tools.readmes import recursive_add_readmes
+
+from devpack.versioning_tools.bump import version_bump
 
 
 def bump():
-    def recursively_add_readmes_from_here():
-        """
-        Add readmes to all python modules in the current directory
-        """
-        parser = argparse.ArgumentParser(description="DevPack add readmes from here")
-        parser.add_argument(
-            "--path", "-p", type=Path, default=Path.cwd(), help="Path to add readmes to"
-        )
-        parser.add_argument(
-            "--verbose", action="store_true", help="Verbose output of touched files"
-        )
-        args = parser.parse_args()
+    """
+    bumps python module python version in the current directory
+    """
+    parser = argparse.ArgumentParser(description="DevPack bump version of this module")
+    parser.add_argument(
+        "--path", "-p", type=Path, default=Path.cwd(), help="Path to python module"
+    )
+    parser.add_argument("--verbose", action="store_true", help="Verbose output of bump")
+    args = parser.parse_args()
 
-        recursive_add_readmes(
-            args.path,
-            touch_mode=args.touch_mode,
-            readme_name=args.readme_name,
-            verbose=args.verbose,
-        )
+    # TODO: #version_bump(        args.path,        touch_mode=args.touch_mode,        readme_name=args.readme_name,        verbose=args.verbose,    )

devpack/versioning_tools/bump.py

@@ -1,15 +1,77 @@
 from pathlib import Path
+from sorcery import assigned_names
+from enum import Enum
 
 
-def bump_version_import(module_name: str, package: str = None) -> str:
+class BumpOrderEnum(Enum):
+    major, minor, patch = assigned_names()
+    micro = patch
+    epoch = major
+
+
+def bump_version_import(
+    module_name: str, package: str = None, order: BumpOrderEnum = BumpOrderEnum.patch
+) -> str:
     import importlib
 
     module = importlib.import_module(module_name, package)
 
     version = module.__version__
 
-    base, _, minor = version.rpartition(".")
-    return base + "." + str(int(minor) + 1)
+    return version_bump(version)
+
+
+def version_partition(version: str) -> str:
+    dot_count = version.count(".")
+
+    if dot_count == 1:
+        major, minor = version.split(".")
+        return int(major), int(minor)
+
+    elif dot_count >= 2:
+        major, minor, patch, *rest = version.split(".")
+
+        return int(major), int(minor), int(patch), *rest
+
+    return (version,)
+
+
+def version_bump(version: str, order: BumpOrderEnum = BumpOrderEnum.patch) -> str:
+    partitioned = version_partition(version)
+
+    if len(partitioned) == 1:
+        return str(int(partitioned[0]) + 1)
+
+    pre = post = ""
+
+    if order == BumpOrderEnum.major:
+        ordered, *post = partitioned
+        post = ".".join([str(p) for p in post])
+
+    elif order == BumpOrderEnum.minor:
+        if len(partitioned) == 2:
+            pre, ordered = partitioned
+        else:
+            pre, ordered, *post = partitioned
+            post = ".".join([str(p) for p in post])
+        pre = str(pre)
+
+    elif order == BumpOrderEnum.patch:
+        if len(partitioned) == 2:
+            pre, ordered = partitioned
+        else:
+            major, minor, ordered, *post = partitioned
+            pre = ".".join((str(major), str(minor)))
+            post = ".".join([str(p) for p in post])
+        pre = str(pre)
+
+    if pre != "":
+        pre = str(pre) + "."
+
+    if post != "":
+        post = "." + str(post)
+
+    return pre + str(int(ordered) + 1) + post
 
 
 def bump_version_regex(file_path: Path, search_regex_str: str) -> str:
@@ -38,3 +100,13 @@ def bump_version_input() -> str:
 
 if __name__ == "__main__":
     print(bump_version_import("warg"))
+
+    def ujhasduhau():
+        for e in BumpOrderEnum:
+            print("__")
+            print(version_bump("1", order=e))
+            print(version_bump("1.2", order=e))
+            print(version_bump("1.2.3", order=e))
+            print(version_bump("1.2.3.4", order=e))
+
+    ujhasduhau()

samples/imports.py

@@ -1,6 +1,5 @@
-import draugr
-
 import apppath
+import draugr
 import warg
 
 print(warg.__version__)