diff --git a/cadetrdm/configuration_options.py b/cadetrdm/configuration_options.py index 1f39bbbdea61083111fa7b86d3c760f5df49bebc..ac42bbe8112cdb8ea9cbdb66e3814ae61a7a1940 100644 --- a/cadetrdm/configuration_options.py +++ b/cadetrdm/configuration_options.py @@ -43,6 +43,8 @@ class Options(Dict): new = super().copy() return Options(new) + # super.update() already takes care of nested dictionaries, so we don't have to + @classmethod def loads(cls, string): decoded = json.loads(string, cls=CustomDecoder) diff --git a/cadetrdm/repositories.py b/cadetrdm/repositories.py index d2f7ee8e685a14ccb2580013b17080af8f45054b..aaef3eebd9709b9871cbf3a85f4198eae797b373 100644 --- a/cadetrdm/repositories.py +++ b/cadetrdm/repositories.py @@ -623,9 +623,6 @@ class ProjectRepo(BaseRepo): self._output_repo = OutputRepo(self.path / self._output_folder) if metadata["cadet_rdm_version"] != cadetrdm.__version__: - print(f"Repo version {metadata['cadet_rdm_version']} is outdated. " - f"Current CADET-RDM version is {cadetrdm.__version__}\n" - "Updating the repository now.") self._update_version(metadata, cadetrdm.__version__) self._on_context_enter_commit_hash = None @@ -666,6 +663,8 @@ class ProjectRepo(BaseRepo): self.add(output_remotes_path) if changes_were_made: + print(f"Repo version {metadata['cadet_rdm_version']} was outdated. " + f"Current CADET-RDM version is {cadetrdm.__version__}.\n Repo has been updated") metadata["cadet_rdm_version"] = cadetrdm_version with open(self.data_json_path, "w") as f: json.dump(metadata, f, indent=2)