fmu-manipulation-toolbox 1.8.2rc2__tar.gz → 1.8.2.2__tar.gz

{fmu_manipulation_toolbox-1.8.2rc2 → fmu_manipulation_toolbox-1.8.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.2rc2
+Version: 1.8.2.2
 Summary: FMU Manipulation Toobox is a python application which help to modify a Functional Mock-up Units (FMUs) without recompilation or to group them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com
@@ -12,6 +12,7 @@ Requires-Dist: colorama>=0.4.6
 Dynamic: author
 Dynamic: description
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

fmu_manipulation_toolbox-1.8.2.2/fmu_manipulation_toolbox/__version__.py

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

{fmu_manipulation_toolbox-1.8.2rc2 → fmu_manipulation_toolbox-1.8.2.2}/fmu_manipulation_toolbox/fmu_container.py

@@ -316,7 +316,7 @@ class FMUContainer:
                 cport = ContainerPort(fmu, port_name)
                 if cport not in self.rules:
                     if cport.port.causality == 'parameter' and auto_parameter:
-                        parameter_name = cport.fmu.model_identifier+"."+cport.port.name
+                        parameter_name = cport.fmu.id + "." + cport.port.name
                         logger.info(f"AUTO PARAMETER: {cport} as {parameter_name}")
                         self.inputs[parameter_name] = cport
                         self.mark_ruled(cport, 'PARAMETER')
@@ -668,11 +668,17 @@ class FMUContainer:
 
     def make_fmu_package(self, base_directory: Path, fmu_filename: Path):
         logger.debug(f"Zipping directory '{base_directory}' => '{fmu_filename}'")
+        zip_directory = self.long_path(str(base_directory.absolute()))
+        offset = len(zip_directory) + 1
         with zipfile.ZipFile(self.fmu_directory / fmu_filename, "w", zipfile.ZIP_DEFLATED) as zip_file:
-            for root, dirs, files in os.walk(base_directory):
-                for file in files:
-                    zip_file.write(self.long_path(os.path.join(root, file)),
-                                   os.path.relpath(os.path.join(root, file), base_directory))
+            def add_file(directory: Path):
+                for entry in directory.iterdir():
+                    if entry.is_dir():
+                        add_file(directory / entry)
+                    elif entry.is_file:
+                        zip_file.write(str(entry), str(entry)[offset:])
+
+            add_file(Path(zip_directory))
         logger.info(f"'{fmu_filename}' is available.")
 
     def make_fmu_cleanup(self, base_directory: Path):

{fmu_manipulation_toolbox-1.8.2rc2 → fmu_manipulation_toolbox-1.8.2.2}/fmu_manipulation_toolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.8.2rc2
+Version: 1.8.2.2
 Summary: FMU Manipulation Toobox is a python application which help to modify a Functional Mock-up Units (FMUs) without recompilation or to group them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com
@@ -12,6 +12,7 @@ Requires-Dist: colorama>=0.4.6
 Dynamic: author
 Dynamic: description
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

fmu_manipulation_toolbox-1.8.2rc2/fmu_manipulation_toolbox/__version__.py

@@ -1 +0,0 @@
-'V1.8.2-rc2'