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 +7 -6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f69500418e - Show all commits

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

@ -92,8 +92,8 @@ class InstallService(CommandABC):
if '==' in dependency: if '==' in dependency:
dependency_version = dependency.split('==')[1] dependency_version = dependency.split('==')[1]
if package in dependency: if name in dependency:
if version.parse(package_version) != version.parse(dependency_version): if package_version != '' and version.parse(package_version) != version.parse(dependency_version):
to_remove_list.append(dependency) to_remove_list.append(dependency)
break break
else: else:
@ -145,9 +145,9 @@ class InstallService(CommandABC):
BuildSettings.__name__: SettingsHelper.get_build_settings_dict(self._build_settings) BuildSettings.__name__: SettingsHelper.get_build_settings_dict(self._build_settings)
} }
#with open(os.path.join(self._runtime.working_directory, 'cpl.json'), 'w') as project_file: with open(os.path.join(self._runtime.working_directory, 'cpl.json'), 'w') as project_file:
# project_file.write(json.dumps(config, indent=2)) project_file.write(json.dumps(config, indent=2))
# project_file.close() project_file.close()
Pip.reset_executable() Pip.reset_executable()

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

@ -16,7 +16,8 @@
"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.post11" "sh_cpl==2021.4.1.post11",
"discord.py==1.6.0"
], ],
"PythonVersion": ">=3.8", "PythonVersion": ">=3.8",
"PythonPath": "../../../../cpl-env/bin/python3.9", "PythonPath": "../../../../cpl-env/bin/python3.9",