sh-edraft.de/sh_cpl
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Sven Heidemann 2021-03-14 14:59:17 +01:00
parent c41e3c0d78
commit 4390fea084
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpl_cli/command/install_service.py
View File

@ -36,16 +36,20 @@ class InstallService(CommandABC):
Error.error('Found invalid dependencies in cpl.json.') Error.error('Found invalid dependencies in cpl.json.')
return return
Pip.set_executable(project.python_path)
for dependency in project.dependencies: for dependency in project.dependencies:
Console.spinner( Console.spinner(
f'Installing: {dependency}', f'Installing: {dependency}',
Pip.install, dependency, Pip.install, dependency,
source='https://pip.sh-edraft.de' if 'sh_cpl' in dependency else None,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
text_foreground_color=ForegroundColorEnum.green, text_foreground_color=ForegroundColorEnum.green,
spinner_foreground_color=ForegroundColorEnum.cyan spinner_foreground_color=ForegroundColorEnum.cyan
) )
Pip.reset_executable()
@staticmethod @staticmethod
def _get_project_settings_dict(project: ProjectSettings) -> dict: def _get_project_settings_dict(project: ProjectSettings) -> dict:
return { return {

28
src/cpl_cli/command/update_service.py
View File

@ -21,25 +21,15 @@ class UpdateService(CommandABC):
@staticmethod @staticmethod
def _install_package(name: str): def _install_package(name: str):
if 'sh_cpl' in name: Pip.install(
Pip.install( name,
name, '--upgrade',
'--upgrade', '--upgrade-strategy',
'--upgrade-strategy', 'eager',
'eager', source='https://pip.sh-edraft.de' if 'sh_cpl' in name else None,
source='https://pip.sh-edraft.de', stdout=subprocess.DEVNULL,
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
stderr=subprocess.DEVNULL )
)
else:
Pip.install(
name,
'--upgrade',
'--upgrade-strategy',
'eager',
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL
)
def _update_project_dependencies(self): def _update_project_dependencies(self):
for package in self._project_settings.dependencies: for package in self._project_settings.dependencies:

6
src/cpl_cli/configuration/project_settings.py
View File

@ -109,10 +109,8 @@ class ProjectSettings(ConfigurationModelABC):
self._python_version = settings[ProjectSettingsNameEnum.python_version.value] self._python_version = settings[ProjectSettingsNameEnum.python_version.value]
if ProjectSettingsNameEnum.python_path.value in settings: if ProjectSettingsNameEnum.python_path.value in settings:
path = os.path.abspath(settings[ProjectSettingsNameEnum.python_path.value]) path = settings[ProjectSettingsNameEnum.python_path.value]
if os.path.isfile(path) or os.path.islink(path): if not os.path.isfile(path) or not os.path.islink(path):
path = os.path.abspath(path)
else:
path = sys.executable path = sys.executable
Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found') Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found')
else: else:

2
src/tests/custom/general/cpl.json
View File

@ -19,7 +19,7 @@
"sh_cpl==2021.4.1" "sh_cpl==2021.4.1"
], ],
"PythonVersion": ">=3.8", "PythonVersion": ">=3.8",
"PythonPath": "/home/sven/Nextcloud_Sven/Schreibtisch/git_sh-edraft_de/sh_common_py_lib/cpl-env/bin/python3.9", "PythonPath": "../../../../cpl-env/bin/python3.9",
"Classifiers": [] "Classifiers": []
}, },
"BuildSettings": { "BuildSettings": {