Merge pull request #527 from RedBearAK/dev_beta

Remove all refs to obsolete/deleted env module
RedBearAK · Feb 9, 2025 · 1f4786a · 1f4786a
2 parents 7d3b1fa + e36abfb
commit 1f4786a
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 431 deletions.
diff --git a/cosmic-dbus-service/toshy_cosmic_dbus_service.py b/cosmic-dbus-service/toshy_cosmic_dbus_service.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-__version__ = '20241014'
+__version__ = '20250208'
 
 # Reference for generating the protocol modules with pywayland scanner:
 # https://github.com/flacjacket/pywayland/issues/8#issuecomment-987040284
@@ -56,8 +56,6 @@
 os.environ['PYTHONPATH'] = f'{parent_folder_path}:{current_folder_path}:{existing_path}'
 
 # local imports now that path is prepped
-import lib.env as env
-
 from lib.env_context import EnvironmentInfo
 
 from protocols.cosmic_toplevel_info_unstable_v1.zcosmic_toplevel_info_v1 import (

diff --git a/default-toshy-config/toshy_config.py b/default-toshy-config/toshy_config.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '20250128'
+__version__ = '20250208'
 ###############################################################################
 ############################   Welcome to Toshy!   ############################
 ###  
@@ -156,8 +156,7 @@
 current_folder_path = os.path.dirname(os.path.abspath(config_globals["__config__"]))
 sys.path.insert(0, current_folder_path)
 
-import lib.env
-
+# Local imports after path has been set
 from lib.env_context import EnvironmentInfo
 from lib.machine_context import get_machine_id_hash
 from lib.notification_manager import NotificationManager

diff --git a/default-toshy-config/toshy_config_barebones.py b/default-toshy-config/toshy_config_barebones.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '20241212'
+__version__ = '20250208'
 ###############################################################################
 ############################   Welcome to Toshy!   ############################
 ###  
@@ -75,8 +75,7 @@
 current_folder_path = os.path.dirname(os.path.abspath(config_globals["__config__"]))
 sys.path.insert(0, current_folder_path)
 
-import lib.env
-
+# Local imports after path has been set
 from lib.env_context import EnvironmentInfo
 from lib.machine_context import get_machine_id_hash
 from lib.notification_manager import NotificationManager

diff --git a/kde-kwin-dbus-service/toshy_kde_dbus_service.py b/kde-kwin-dbus-service/toshy_kde_dbus_service.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-__version__ = '20241016'
+__version__ = '20250208'
 
 print("(--) Starting Toshy D-Bus service to receive updates from KWin script...")
 
@@ -42,8 +42,6 @@
 os.environ['PYTHONPATH'] = f'{parent_folder_path}:{current_folder_path}:{existing_path}'
 
 # local imports now that path is prepped
-import lib.env as env
-
 from lib.env_context import EnvironmentInfo
 
 if os.name == 'posix' and os.geteuid() == 0:

diff --git a/kde-kwin-dbus-service/toshy_kde_kwin_script_setup.py b/kde-kwin-dbus-service/toshy_kde_kwin_script_setup.py
@@ -29,8 +29,6 @@
 os.environ['PYTHONPATH'] = f'{parent_folder_path}:{current_folder_path}:{existing_path}'
 
 # local imports now that path is prepped
-import lib.env as env
-
 from lib.env_context import EnvironmentInfo
 
 if os.name == 'posix' and os.geteuid() == 0: