From 44e62afdc3ca2703270b90aa042fb2143e247d78 Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Wed, 24 Nov 2021 07:36:10 -0800 Subject: [PATCH] Updated version number, renamed merger.set_excluded_packages For #439 --- buildingspy/CHANGES.txt | 4 +++- buildingspy/VERSION | 2 +- buildingspy/development/merger.py | 23 ++++++++++++----------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/buildingspy/CHANGES.txt b/buildingspy/CHANGES.txt index 6b7a2f53..3158d58d 100644 --- a/buildingspy/CHANGES.txt +++ b/buildingspy/CHANGES.txt @@ -1,8 +1,10 @@ BuildingsPy Changelog --------------------- -Version 2.2.0, xxx, 2020 -- Release 2.2 +Version 3.0.0, xxx, 2021 -- Release 3.0 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +- For merge script, renamed set_excluded_packages to set_excluded_directories + (https://github.com/lbl-srg/BuildingsPy/issues/439) - For Dymola simulations, corrected call to openModel in buildingspy/simulate/Dymola.py - For unit tests, avoided copying .log and .mat files to temporary directory (https://github.com/lbl-srg/BuildingsPy/issues/428) diff --git a/buildingspy/VERSION b/buildingspy/VERSION index 56b2e3e2..bb9f31ec 100644 --- a/buildingspy/VERSION +++ b/buildingspy/VERSION @@ -1 +1 @@ -2.2.dev0 \ No newline at end of file +3.0.dev0 \ No newline at end of file diff --git a/buildingspy/development/merger.py b/buildingspy/development/merger.py index 51ca976f..7ed64b59 100755 --- a/buildingspy/development/merger.py +++ b/buildingspy/development/merger.py @@ -16,7 +16,7 @@ class IBPSA(object): By default, the top-level packages `Experimental` and `Obsolete` are not included in the merge. This can be overwritten with the function - :meth:`~set_excluded_packages`. + :meth:`~set_excluded_directories`. """ @@ -50,8 +50,9 @@ def isValidLibrary(lib_home): self._new_library_name = os.path.basename(dest_dir) # Exclude packages and files - self.set_excluded_packages(["Experimental", - "Obsolete"]) + self.set_excluded_directories(["Experimental", + "Obsolete", + ".FMUOutput"]) self._excluded_files = [os.path.join(ibpsa_dir, "package.mo"), os.path.join(ibpsa_dir, "dymosim"), os.path.join(ibpsa_dir, "dymosim.exe"), @@ -90,15 +91,15 @@ def isValidLibrary(lib_home): os.path.join(ibpsa_dir, "Resources", "www", "modelicaDoc.css"), os.path.join(ibpsa_dir, "legal.html")] - def set_excluded_packages(self, packages): - """ Set the packages that are excluded from the merge. + def set_excluded_directories(self, directories): + """ Set the directories that are excluded from the merge. - :param packages: A list of packages to be excluded. + :param packages: A list of directories to be excluded. """ - if not isinstance(packages, list): + if not isinstance(directories, list): raise ValueError("Argument must be a list.") - self._excluded_packages = packages + self._excluded_directories = directories def _copy_mo_and_mos(self, source_file, destination_file): """ Update the library name and do other replacements that @@ -316,7 +317,7 @@ def merge(self, overwrite_reference_results=False): filesToCopy = list() for root, dirs, files in os.walk(self._ibpsa_home, topdown=True): - dirs[:] = [d for d in dirs if d not in self._excluded_packages] + dirs[:] = [d for d in dirs if d not in self._excluded_directories] for file in files: filesToCopy.append(os.path.join(root, file)) @@ -363,9 +364,9 @@ def merge(self, overwrite_reference_results=False): elif desFil.startswith(ref_res): dir_name = os.path.dirname(desFil) base_name = os.path.basename(desFil) - # Check if the file needs be skipped because it is from an excluded package. + # Check if the file needs be skipped because it is from an excluded directory. skip = False - for pac in self._excluded_packages: + for pac in self._excluded_directories: if "{}_{}".format(self._src_library_name, pac) in base_name: skip = True if not skip: