rafactor - try to fix 'snapbtrex not a package'

pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"

setup.py

@@ -1,6 +1,6 @@
 import setuptools
 
-VERSION = "2.0.7"
+VERSION = "2.0.9"
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
@@ -17,11 +17,12 @@
     url="https://github.com/yoshtec/snapbtrex",
     entry_points={
         "console_scripts": [
-            "snapbtrex = snapbtrex.cli:main",
-            "snapbtrex.py = snapbtrex.cli:main",
+            "snapbtrex=snapbtrex.cli:main",
+            "snapbtrex.py=snapbtrex.cli:main",
         ]
     },
-    packages=setuptools.find_packages(),
+    #packages=setuptools.find_packages(exclude=["tests", "tests.*"]),
+    packages=['snapbtrex'],
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Programming Language :: Python :: 3",

snapbtrex/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# SPDX-License-Identifier: BSD
+
+# __init__.py for the package
+
+# Importing submodules
+#from .operations import Operations, FakeOperations, DryOperations
+#from .cli import main

snapbtrex/__main__.py

@@ -1,4 +1,5 @@
 from .cli import main
+import sys
 
 if __name__ == "__main__":
-    main()
+    main(sys.argv)

snapbtrex/cli.py

@@ -1,6 +1,5 @@
-import sys
-import time
-from .snapbtrex import (
+import sys, time
+from .operations import (
     FakeOperations,
     Operations,
     DryOperations,
@@ -9,19 +8,6 @@
 )
 
 
-def log_trace(fmt, *args, **kwargs):
-    try:
-        tt = time.strftime(DATE_FORMAT, time.gmtime(None)) + ": "
-        if args:
-            print(tt + (fmt % args))
-        elif kwargs:
-            print(tt + (fmt % kwargs))
-        else:
-            print(tt + fmt)
-    except (Exception,):
-        print(fmt)
-
-
 def default_trace(fmt, *args, **kwargs):
     try:
         if args:
@@ -34,6 +20,11 @@ def default_trace(fmt, *args, **kwargs):
         print(fmt)
 
 
+def log_trace(fmt, *args, **kwargs):
+    tt = time.strftime(DATE_FORMAT, time.gmtime(None)) + ": " + fmt
+    default_trace(tt, *args, **kwargs)
+
+
 def null_trace(fmt, *args, **kwargs):
     pass
 
@@ -400,7 +391,3 @@ def parse_ageoffset_to_timestamp(age_str):
         operations.log_local(
             "no options for cleaning were passed -> keeping all snapshots"
         )
-
-
-if "__main__" == __name__:
-    sys.exit(main(sys.argv))

snapbtrex/snapbtrex.py → snapbtrex/operations.py

@@ -610,8 +610,11 @@ def sync_cleandir(self, target_dir, sync_keep):
                         self.unsnapx(os.path.join(target_dir, del_dir))
 
 
-# Allows to Simulate operations
 class DryOperations(Operations):
+    """
+    DryOperations is a subclass of Operations that simulates operations without making changes
+    """
+
     def __init__(self, path, trace=None):
         Operations.__init__(self, path=path, trace=trace)
         self.dirs = None