2021.11 #49

Manually merged
edraft merged 10 commits from 2021.11 into master 2021-11-30 12:03:04 +01:00
2 changed files with 43 additions and 18 deletions
Showing only changes of commit 403837901b - Show all commits

View File

@ -172,14 +172,15 @@ class InstallService(CommandABC):
self._project_settings.dependencies.append(new_name) self._project_settings.dependencies.append(new_name)
config = { if not self._is_simulating:
ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings), config = {
BuildSettings.__name__: SettingsHelper.get_build_settings_dict(self._build_settings) ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings),
} BuildSettings.__name__: SettingsHelper.get_build_settings_dict(self._build_settings)
}
with open(os.path.join(self._env.working_directory, self._project_file), 'w') as project_file: with open(os.path.join(self._env.working_directory, self._project_file), 'w') as project_file:
project_file.write(json.dumps(config, indent=2)) project_file.write(json.dumps(config, indent=2))
project_file.close() project_file.close()
Pip.reset_executable() Pip.reset_executable()

View File

@ -2,6 +2,7 @@ import json
import os import os
import subprocess import subprocess
import textwrap import textwrap
import time
from cpl_core.configuration.configuration_abc import ConfigurationABC from cpl_core.configuration.configuration_abc import ConfigurationABC
from cpl_core.console.console import Console from cpl_core.console.console import Console
@ -31,6 +32,9 @@ class UninstallService(CommandABC):
self._env = env self._env = env
self._build_settings = build_settings self._build_settings = build_settings
self._project_settings = project_settings self._project_settings = project_settings
self._is_simulating = False
self._is_virtual = False
@property @property
def help_message(self) -> str: def help_message(self) -> str:
@ -41,6 +45,9 @@ class UninstallService(CommandABC):
Arguments: Arguments:
package The package to uninstall package The package to uninstall
""") """)
def _wait(self, t: int, *args, source: str = None, stdout=None, stderr=None):
time.sleep(t)
def run(self, args: list[str]): def run(self, args: list[str]):
""" """
@ -52,13 +59,28 @@ class UninstallService(CommandABC):
Console.error(f'Expected package') Console.error(f'Expected package')
Console.error(f'Usage: cpl uninstall <package>') Console.error(f'Usage: cpl uninstall <package>')
return return
if '--virtual' in args:
self._is_virtual = True
args.remove('--virtual')
Console.write_line('Running in virtual mode:')
if '--simulate' in args:
self._is_virtual = True
args.remove('--simulate')
Console.write_line('Running in simulation mode:')
Pip.set_executable(self._project_settings.python_executable) if not self._is_virtual:
Pip.set_executable(self._project_settings.python_executable)
package = args[0] package = args[0]
is_in_dependencies = False is_in_dependencies = False
pip_package = Pip.get_package(package) if not self._is_virtual:
pip_package = Pip.get_package(package)
else:
pip_package = package
for dependency in self._project_settings.dependencies: for dependency in self._project_settings.dependencies:
if package in dependency: if package in dependency:
@ -74,7 +96,7 @@ class UninstallService(CommandABC):
Console.spinner( Console.spinner(
f'Uninstalling: {package}', f'Uninstalling: {package}',
Pip.uninstall, package, Pip.uninstall if not self._is_virtual else self._wait, package if not self._is_virtual else 2,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
text_foreground_color=ForegroundColorEnum.green, text_foreground_color=ForegroundColorEnum.green,
@ -83,13 +105,15 @@ class UninstallService(CommandABC):
if package in self._project_settings.dependencies: if package in self._project_settings.dependencies:
self._project_settings.dependencies.remove(package) self._project_settings.dependencies.remove(package)
config = { if not self._is_simulating:
ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings), config = {
BuildSettings.__name__: SettingsHelper.get_build_settings_dict(self._build_settings) ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings),
} BuildSettings.__name__: SettingsHelper.get_build_settings_dict(self._build_settings)
with open(os.path.join(self._env.working_directory, f'{self._config.get_configuration("ProjectName")}.json'), 'w') as project_file: }
project_file.write(json.dumps(config, indent=2)) with open(os.path.join(self._env.working_directory, f'{self._config.get_configuration("ProjectName")}.json'), 'w') as project_file:
project_file.close() project_file.write(json.dumps(config, indent=2))
project_file.close()
Console.write_line(f'Removed {package}') Console.write_line(f'Removed {package}')
Pip.reset_executable() if not self._is_virtual:
Pip.reset_executable()