2022.6 #88

Merged
edraft merged 158 commits from 2022.6 into master 2022-06-29 17:50:07 +02:00
2 changed files with 19 additions and 7 deletions
Showing only changes of commit 0710b25317 - Show all commits

View File

@ -36,6 +36,8 @@ class UninstallService(CommandABC):
self._is_simulating = False
self._is_virtual = False
self._is_dev = False
self._project_file = f'{self._project_settings.name}.json'
@property
@ -62,6 +64,10 @@ class UninstallService(CommandABC):
Console.error(f'Usage: cpl uninstall <package>')
return
if 'dev' in args:
self._is_dev = True
args.remove('dev')
if '--virtual' in args:
self._is_virtual = True
args.remove('--virtual')
@ -82,7 +88,11 @@ class UninstallService(CommandABC):
else:
pip_package = package
for dependency in self._project_settings.dependencies:
deps = self._project_settings.dependencies
if self._is_dev:
deps = self._project_settings.dev_dependencies
for dependency in deps:
if package in dependency:
is_in_dependencies = True
package = dependency
@ -95,7 +105,7 @@ class UninstallService(CommandABC):
package = pip_package
Console.spinner(
f'Uninstalling: {package}',
f'Uninstalling: {package}' if not self._is_dev else f'Uninstalling dev: {package}',
Pip.uninstall if not self._is_virtual else self._wait, package if not self._is_virtual else 2,
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
@ -103,8 +113,12 @@ class UninstallService(CommandABC):
spinner_foreground_color=ForegroundColorEnum.cyan
)
if package in self._project_settings.dependencies:
self._project_settings.dependencies.remove(package)
deps = self._project_settings.dependencies
if self._is_dev:
deps = self._project_settings.dev_dependencies
if package in deps:
deps.remove(package)
if not self._is_simulating:
config = {
ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings),

View File

@ -18,9 +18,7 @@
"Dependencies": [
"cpl_core==2022.6.1"
],
"DevDependencies": [
"cpl-cli==2022.6.17.dev10"
],
"DevDependencies": [],
"PythonVersion": ">=3.10",
"PythonPath": {
"linux": "../../venv/bin/python",