#173 #174

Merged
edraft merged 2 commits from #173 into master 2023-06-12 20:48:35 +02:00
2 changed files with 25 additions and 10 deletions
Showing only changes of commit 8e12c72b07 - Show all commits

View File

@ -154,6 +154,24 @@ class UpdateService(CommandABC):
Console.write_line(f"\tUpdate with {Pip.get_executable()} -m pip install --upgrade <package>") Console.write_line(f"\tUpdate with {Pip.get_executable()} -m pip install --upgrade <package>")
Console.set_foreground_color(ForegroundColorEnum.default) Console.set_foreground_color(ForegroundColorEnum.default)
def _save_formatted_package_name_to_deps_collection(self, deps: [str], old_package: str, new_package: str):
if old_package not in deps:
return
initial_package = new_package
if "/" in new_package:
new_package = new_package.split("/")[0]
if "\r" in new_package:
new_package = new_package.replace("\r", "")
if new_package == initial_package:
return
index = self._project_settings.dependencies.index(old_package)
deps[index] = new_package
def _project_json_update_dependency(self, old_package: str, new_package: str): def _project_json_update_dependency(self, old_package: str, new_package: str):
""" """
Writes new package version to project.json Writes new package version to project.json
@ -164,15 +182,12 @@ class UpdateService(CommandABC):
if self._is_simulation: if self._is_simulation:
return return
if old_package in self._project_settings.dependencies: self._save_formatted_package_name_to_deps_collection(
index = self._project_settings.dependencies.index(old_package) self._project_settings.dependencies, old_package, new_package
if "/" in new_package: )
new_package = new_package.split("/")[0] self._save_formatted_package_name_to_deps_collection(
self._project_settings.dev_dependencies, old_package, new_package
if "\r" in new_package: )
new_package = new_package.replace("\r", "")
self._project_settings.dependencies[index] = new_package
config = { config = {
ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings), ProjectSettings.__name__: SettingsHelper.get_project_settings_dict(self._project_settings),

View File

@ -4,7 +4,7 @@
"Version": { "Version": {
"Major": "2023", "Major": "2023",
"Minor": "4", "Minor": "4",
"Micro": "0" "Micro": "0.post1"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",