From e0f69c9bdf1898ddfffcf0c584172511f43a2ca0 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Wed, 25 May 2022 18:56:08 +0200 Subject: [PATCH] Fixed old naming of cpl_core --- src/cpl_cli/command/install_service.py | 14 +++++++------- src/cpl_cli/command/new_service.py | 2 +- src/cpl_cli/command/update_service.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cpl_cli/command/install_service.py b/src/cpl_cli/command/install_service.py index 873d4e72..688632a3 100644 --- a/src/cpl_cli/command/install_service.py +++ b/src/cpl_cli/command/install_service.py @@ -38,7 +38,7 @@ class InstallService(CommandABC): self._build_settings = build_settings self._project_settings = project_settings self._cli_settings = cli_settings - + self._is_simulation = False self._is_virtual = False @@ -53,7 +53,7 @@ class InstallService(CommandABC): Arguments: package The package to install """) - + def _wait(self, t: int, *args, source: str = None, stdout=None, stderr=None): time.sleep(t) @@ -77,7 +77,7 @@ class InstallService(CommandABC): Console.spinner( f'Installing: {dependency}', Pip.install if not self._is_virtual else self._wait, dependency if not self._is_virtual else 2, - source=self._cli_settings.pip_path if 'sh_cpl' in dependency else None, + source=self._cli_settings.pip_path if 'cpl-' in dependency else None, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, text_foreground_color=ForegroundColorEnum.green, @@ -140,13 +140,13 @@ class InstallService(CommandABC): Console.spinner( f'Installing: {package}', Pip.install if not self._is_virtual else self._wait, package if not self._is_virtual else 2, - source=self._cli_settings.pip_path if 'sh_cpl' in package else None, + source=self._cli_settings.pip_path if 'cpl-' in package else None, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, text_foreground_color=ForegroundColorEnum.green, spinner_foreground_color=ForegroundColorEnum.cyan ) - + if self._is_virtual: new_package = name else: @@ -177,7 +177,7 @@ class InstallService(CommandABC): 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: project_file.write(json.dumps(config, indent=2)) project_file.close() @@ -194,7 +194,7 @@ class InstallService(CommandABC): self._is_virtual = True args.remove('virtual') Console.write_line('Running in virtual mode:') - + if 'simulate' in args: self._is_simulation = True args.remove('simulate') diff --git a/src/cpl_cli/command/new_service.py b/src/cpl_cli/command/new_service.py index ea1fa940..916abec3 100644 --- a/src/cpl_cli/command/new_service.py +++ b/src/cpl_cli/command/new_service.py @@ -99,7 +99,7 @@ class NewService(CommandABC): ProjectSettingsNameEnum.license_name.value: '', ProjectSettingsNameEnum.license_description.value: '', ProjectSettingsNameEnum.dependencies.value: [ - f'sh_cpl-core>={version.parse(cpl_core.__version__)}' + f'cpl-core>={version.parse(cpl_core.__version__)}' ], ProjectSettingsNameEnum.python_version.value: f'>={sys.version.split(" ")[0]}', ProjectSettingsNameEnum.python_path.value: { diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py index b667ea58..5d082109 100644 --- a/src/cpl_cli/command/update_service.py +++ b/src/cpl_cli/command/update_service.py @@ -73,7 +73,7 @@ class UpdateService(CommandABC): '--upgrade', '--upgrade-strategy', 'eager', - source=self._cli_settings.pip_path if 'sh_cpl' in name else None, + source=self._cli_settings.pip_path if 'cpl-' in name else None, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL )