formating

Author: cnheider

devpack/__init__.py

@@ -31,27 +31,15 @@
     # "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"
 
+from warg import dist_is_editable
+
 distributions = {v.key: v for v in pkg_resources.working_set}
 if PROJECT_NAME in distributions:
     distribution = distributions[PROJECT_NAME]

devpack/batch_tools/privates.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/entry_points/versioning.py

@@ -1,8 +1,6 @@
 import argparse
 from pathlib import Path
 
-from devpack.versioning_tools.bump import version_bump
-
 
 def bump():
     """

devpack/versioning_tools/bump.py

@@ -1,6 +1,7 @@
+from enum import Enum
 from pathlib import Path
+
 from sorcery import assigned_names
-from enum import Enum
 
 
 class BumpOrderEnum(Enum):
@@ -10,15 +11,18 @@ class BumpOrderEnum(Enum):
 
 
 def bump_version_import(
-    module_name: str, package: str = None, order: BumpOrderEnum = BumpOrderEnum.patch
+    module_name: str,
+    package: str = None,
+    order: BumpOrderEnum = BumpOrderEnum.patch,
+    reset_lower_order: bool = True,
 ) -> str:
     import importlib
 
     module = importlib.import_module(module_name, package)
 
     version = module.__version__
 
-    return version_bump(version)
+    return version_bump(version, reset_lower_order=reset_lower_order)
 
 
 def version_partition(version: str) -> str:
@@ -36,11 +40,17 @@ def version_partition(version: str) -> str:
     return (version,)
 
 
-def version_bump(version: str, order: BumpOrderEnum = BumpOrderEnum.patch) -> str:
+def version_bump(
+    version: str,
+    order: BumpOrderEnum = BumpOrderEnum.patch,
+    reset_lower_order: bool = True,
+) -> str:
     # TODO: HANDLE weird alpha, beta, rc versioning e.g. 1.2a, 12.3.alpha, 1.2.3.4rc
 
     partitioned = version_partition(version)
 
+    # TODO: USE reset_lower_order!
+
     if len(partitioned) == 1:
         return str(int(partitioned[0]) + 1)
 
@@ -71,6 +81,9 @@ def version_bump(version: str, order: BumpOrderEnum = BumpOrderEnum.patch) -> st
         pre = str(pre) + "."
 
     if post != "":
+        if reset_lower_order:
+            post = ".".join(["0" for p in post.split(".")])
+
         post = "." + str(post)
 
     return pre + str(int(ordered) + 1) + post
@@ -110,5 +123,7 @@ def ujhasduhau():
             print(version_bump("1.2", order=e))
             print(version_bump("1.2.3", order=e))
             print(version_bump("1.2.3.4", order=e))
+            print("_")
+            print(version_bump("1.2.3.4", order=e, reset_lower_order=False))
 
     ujhasduhau()

samples/imports.py

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