PyPI - fmu-manipulation-toolbox - Versions diffs - 1.8.4__tar.gz → 1.8.4.1rc1__tar.gz - Mend

@@ -146,7 +146,7 @@ class ContainerPort:
         return f"Port {self.fmu.name}/{self.port.name}"
     def __hash__(self):
-        return hash(f"{self}")
+        return hash(str(self))
     def __eq__(self, other):
         return str(self) == str(other)
@@ -266,7 +266,7 @@ class FMUContainer:
         try:
             fmu = EmbeddedFMU(self.fmu_directory / fmu_filename)
-            self.involved_fmu[fmu_filename] = fmu
+            self.involved_fmu[fmu.name] = fmu
             self.execution_order.append(fmu)
             if not fmu.fmi_version == "2.0":
                 raise FMUContainerError("Only FMI-2.0 is supported by FMUContainer")
@@ -727,9 +727,9 @@ class FMUContainer:
                 binary_directory.mkdir(exist_ok=True)
                 shutil.copy(library_filename, binary_directory / f"{self.identifier}.dll")
-        for fmu in self.involved_fmu.values():
+        for i, fmu in enumerate(self.involved_fmu.values()):
             shutil.copytree(self.long_path(fmu.fmu.tmp_directory),
-                            self.long_path(resources_directory / fmu.name), dirs_exist_ok=True)
+                            self.long_path(resources_directory / f"{i:02x}"), dirs_exist_ok=True)
         return resources_directory
     def make_fmu_package(self, base_directory: Path, fmu_filename: Path):

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.4
+Version: 1.8.4.1rc1
 Summary: FMU Manipulation Toolbox is a python application for modifying Functional Mock-up Units (FMUs) without recompilation or bundling them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.4
+Version: 1.8.4.1rc1
 Summary: FMU Manipulation Toolbox is a python application for modifying Functional Mock-up Units (FMUs) without recompilation or bundling them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

@@ -77,6 +77,14 @@ class FMUManipulationToolboxTestSuite(unittest.TestCase):
         self.assert_identical_files("containers/arch/REF-flat-dump.json",
                                     "containers/arch/flat-dump.json")
+    def test_container_subdir_flat(self):
+        container = FMUContainer("sub.fmu", fmu_directory=Path("containers/arch"))
+        container.get_fmu("subdir/gain2.fmu")
+        container.get_fmu("integrate.fmu")
+        container.get_fmu("sine.fmu")
+        container.add_implicit_rule()
+        container.make_fmu("sub.fmu", step_size=0.5)
     def test_container_json_hierarchical(self):
         assembly = Assembly("hierarchical.json", fmu_directory=Path("containers/arch"))
         assembly.make_fmu(dump_json=True)

	@@ -0,0 +1 @@
1	+ 'V1.8.4.1-rc1'

	@@ -1 +0,0 @@
1	- 'V1.8.4'

fmu-manipulation-toolbox 1.8.4__tar.gz → 1.8.4.1rc1__tar.gz