Update package version source

bin/compile.py

@@ -18,7 +18,7 @@ from command_runner import command_runner
 # Insert parent dir as path se we get to use npbackup as package
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "..")))
 
-from npbackup import __version__ as npbackup_version
+from npbackup.__main__ import __version__ as npbackup_version
 from bin.NPBackupInstaller import __version__ as installer_version
 from npbackup.customization import (
     COMPANY_NAME,

npbackup/__init__.py

@@ -3,6 +3,4 @@
 #
 # This file is part of npbackup
 
-__intname__ = "npbackup"
-__build__ = "2023012901"
-__version__ = "2.1.0"
+# Placeholder so this directory becomes a package

npbackup/core/runner.py

@@ -23,7 +23,7 @@ from npbackup.restic_metrics import restic_output_2_metrics, upload_metrics
 from npbackup.restic_wrapper import ResticRunner
 from npbackup.core.restic_source_binary import get_restic_internal_binary
 from npbackup.path_helper import CURRENT_DIR, BASEDIR
-from npbackup import __intname__ as NAME, __version__ as VERSION
+from npbackup.__main__ import __intname__ as NAME, __version__ as VERSION
 
 
 logger = getLogger(__intname__)

setup.py

@@ -86,9 +86,10 @@ class BinaryDistribution(setuptools.Distribution):
 
 
 package_path = os.path.abspath(PACKAGE_NAME)
-package_file = os.path.join(package_path, "__main__.py")
-if not os.path.isfile(package_file):
-    package_file = os.path.join(package_path, "npbackup.py")
+for path in ['__main__.py', PACKAGE_NAME + '.py']:
+    package_file = os.path.join(package_path, "__main__.py")
+    if  os.path.isfile(package_file):
+        break
 metadata = get_metadata(package_file)
 requirements = parse_requirements(os.path.join(package_path, "requirements.txt"))
 long_description = _read_file("README.md")