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

2021.4 #19

Merged
edraft merged 237 commits from 2021.4 into master 2021-04-01 10:13:33 +02:00
Conversation 0 Commits 237 Files Changed 325 +6 -3
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bc99763329 - Show all commits

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

@ -107,6 +107,9 @@ class UpdateService(CommandABC):
if '/' in new_package: if '/' in new_package:
new_package = new_package.split('/')[0] new_package = new_package.split('/')[0]
if '\\' in new_package:
new_package = new_package.split('\\')[0]
self._project_settings.dependencies[index] = new_package self._project_settings.dependencies[index] = new_package
config = { config = {

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

@ -110,7 +110,7 @@ class ProjectSettings(ConfigurationModelABC):
if ProjectSettingsNameEnum.python_path.value in settings: if ProjectSettingsNameEnum.python_path.value in settings:
path = settings[ProjectSettingsNameEnum.python_path.value] path = settings[ProjectSettingsNameEnum.python_path.value]
if not os.path.isfile(path) or not os.path.islink(path): if not os.path.isfile(path) and not os.path.islink(path):
if path != '' and path is not None: if path != '' and path is not None:
Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found') Error.warn(f'{ProjectSettingsNameEnum.python_path.value} not found')

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

@ -16,7 +16,7 @@
"LicenseName": "MIT", "LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
"Dependencies": [ "Dependencies": [
"sh_cpl==2021.4.1.post9" "sh_cpl==2021.4.1.post11"
], ],
"PythonVersion": ">=3.8", "PythonVersion": ">=3.8",
"PythonPath": "../../../../cpl-env/bin/python3.9", "PythonPath": "../../../../cpl-env/bin/python3.9",