diff --git a/bin/compile.py b/bin/compile.py index 4addc09..706edd6 100644 --- a/bin/compile.py +++ b/bin/compile.py @@ -33,7 +33,7 @@ from command_runner import command_runner from ofunctions.platform import python_arch, get_os if os.name == "nt": from npbackup.windows.sign_windows import sign -from npbackup.path_helper import IS_LEGACY +from npbackup.__version__ import IS_LEGACY AUDIENCES = ["public", "private"] BUILD_TYPES = ["cli", "gui", "viewer"] diff --git a/npbackup/core/restic_source_binary.py b/npbackup/core/restic_source_binary.py index b53c1a8..c2ef5c4 100644 --- a/npbackup/core/restic_source_binary.py +++ b/npbackup/core/restic_source_binary.py @@ -13,7 +13,8 @@ __build__ = "2023061102" import os import sys import glob -from npbackup.path_helper import BASEDIR, IS_LEGACY +from npbackup.__version__ import IS_LEGACY +from npbackup.path_helper import BASEDIR RESTIC_SOURCE_FILES_DIR = os.path.join(BASEDIR, os.pardir, "RESTIC_SOURCE_FILES") diff --git a/npbackup/path_helper.py b/npbackup/path_helper.py index 44ecb25..5f187b4 100644 --- a/npbackup/path_helper.py +++ b/npbackup/path_helper.py @@ -24,5 +24,3 @@ CURRENT_DIR = os.path.dirname(CURRENT_EXECUTABLE) # When run with nuitka onefile, this will be the temp directory, else, this will be the path to current file BASEDIR = os.path.abspath(os.path.dirname(os.path.realpath(__file__))) -# Python 3.7 versions are considered legacy since they don't support msgspec -IS_LEGACY = True if sys.version_info[1] < 8 else False diff --git a/npbackup/restic_wrapper/__init__.py b/npbackup/restic_wrapper/__init__.py index a28b694..9c8ade5 100644 --- a/npbackup/restic_wrapper/__init__.py +++ b/npbackup/restic_wrapper/__init__.py @@ -24,6 +24,7 @@ from command_runner import command_runner from ofunctions.misc import BytesConverter, fn_name from npbackup.__debug__ import _DEBUG from npbackup.__env__ import FAST_COMMANDS_TIMEOUT, CHECK_INTERVAL, HEARTBEAT_INTERVAL +from npbackup.__version__ import IS_LEGACY from npbackup.path_helper import CURRENT_DIR from npbackup.restic_wrapper import schema diff --git a/npbackup/upgrade_client/upgrader.py b/npbackup/upgrade_client/upgrader.py index dcfbee0..c035a6d 100644 --- a/npbackup/upgrade_client/upgrader.py +++ b/npbackup/upgrade_client/upgrader.py @@ -23,9 +23,9 @@ from ofunctions.platform import get_os, python_arch from ofunctions.process import kill_childs from ofunctions.requestor import Requestor from command_runner import deferred_command -from npbackup.path_helper import CURRENT_DIR, CURRENT_EXECUTABLE, IS_LEGACY +from npbackup.path_helper import CURRENT_DIR, CURRENT_EXECUTABLE from npbackup.core.nuitka_helper import IS_COMPILED -from npbackup.__version__ import __version__ as npbackup_version +from npbackup.__version__ import __version__ as npbackup_version, IS_LEGACY logger = getLogger()