sh-edraft.de/sh_cpl
2
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:47:53 +01:00
parent 7ffd553709
commit c41e3c0d78
32 changed files with 101 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpl_cli/configuration/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = 'cpl_cli.configuration'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.1.post2'
__version__ = '2021.4.1'
from collections import namedtuple
@@ -28,4 +28,4 @@ from .version_settings import VersionSettings
from .version_settings_name_enum import VersionSettingsNameEnum
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='04', micro='01-2')
version_info = VersionInfo(major='2021', minor='04', micro='01')

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

@@ -8,6 +8,7 @@ from cpl.console.console import Console
from cpl.console.foreground_color_enum import ForegroundColorEnum
from cpl_cli.configuration.version_settings import VersionSettings
from cpl_cli.configuration.project_settings_name_enum import ProjectSettingsNameEnum
from cpl_cli.error import Error
class ProjectSettings(ConfigurationModelABC):
@@ -107,11 +108,16 @@ class ProjectSettings(ConfigurationModelABC):
self._dependencies = settings[ProjectSettingsNameEnum.dependencies.value]
self._python_version = settings[ProjectSettingsNameEnum.python_version.value]
path = os.path.abspath(settings[ProjectSettingsNameEnum.python_path.value])
if os.path.isfile(path) or os.path.islink(path):
path = os.path.abspath(path)
if ProjectSettingsNameEnum.python_path.value in settings:
path = os.path.abspath(settings[ProjectSettingsNameEnum.python_path.value])
if os.path.isfile(path) or os.path.islink(path):
path = os.path.abspath(path)
else:
path = sys.executable
Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found')
else:
path = sys.executable
Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found')
self._python_path = path