fmu-manipulation-toolbox 1.8.2rc2__py3-none-any.whl → 1.8.2.2__py3-none-any.whl

fmu_manipulation_toolbox/__version__.py

@@ -1 +1 @@
-'V1.8.2-rc2'
+'V1.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.dist-info → fmu_manipulation_toolbox-1.8.2.2.dist-info}/METADATA

@@ -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.dist-info → fmu_manipulation_toolbox-1.8.2.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 fmu_manipulation_toolbox/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 fmu_manipulation_toolbox/__main__.py,sha256=mAzrtkil506DS0F3g3CEbHdtZsZotzntcNhIn_lNJkw,344
-fmu_manipulation_toolbox/__version__.py,sha256=gH9BBqhOUmu3T0bGuVJw2HoybsfzfEsU3Y0umpitY8s,13
+fmu_manipulation_toolbox/__version__.py,sha256=ZmwMmmqLfOucUilq7TffGXkEyo_UIsEcgO0NvL9PaIA,11
 fmu_manipulation_toolbox/assembly.py,sha256=pAAE_eWPfD-8BzZ7gvaHARhQt4-IV2jVvsMnJXeAtLI,25541
 fmu_manipulation_toolbox/checker.py,sha256=lE2MpH4BAKCDjUvbr06N56u7ao8hWXaJgMKaLvmhFTQ,2272
 fmu_manipulation_toolbox/cli.py,sha256=2p5T1qp7kTcMlScwmvXyUfEmAIGSJsld96ObY216QMA,10616
-fmu_manipulation_toolbox/fmu_container.py,sha256=VTZlRTXAYcaYLijgN4ReuG6hLQ2XRgxctPJdEYRfOcc,28755
+fmu_manipulation_toolbox/fmu_container.py,sha256=n_PBIpB_8vUKtEUKjXSDelreW_cu7HZrhP_nouyE80s,28927
 fmu_manipulation_toolbox/fmu_operations.py,sha256=WE-lCNNOYr3pakMkwzpsp_lBhb2P4s7Ez5HnxQLbVdk,15814
 fmu_manipulation_toolbox/gui.py,sha256=bGG4iPddGsT4tLBv1zjSpbIkyctHVfbRt0kGxdTTrTc,29219
 fmu_manipulation_toolbox/gui_style.py,sha256=jjDhzSw5hu_6-bOOhsvI_MxQZOqt9SjpKK6T83Gubr4,2926
@@ -37,16 +37,16 @@ fmu_manipulation_toolbox/resources/fmi-2.0/fmi2VariableDependency.xsd,sha256=Tc9
 fmu_manipulation_toolbox/resources/linux32/client_sm.so,sha256=xVdY2zy13pa2DcvFiweSNpp7E6DiONqeoBdlcJHrW_k,35940
 fmu_manipulation_toolbox/resources/linux32/server_sm,sha256=1TLGqNPyM5UVOrCfzNqWyF6ClLksY3EiY3CSsrnp6c0,22836
 fmu_manipulation_toolbox/resources/linux64/client_sm.so,sha256=EhY1XHo1YcQn6yqZ7wk5okqtZyp0MrcCsGcudqE-aIM,37000
-fmu_manipulation_toolbox/resources/linux64/container.so,sha256=onX32320NM2_EJMtLflknpte9WaN7ZUSyezTOc0HCGY,45984
+fmu_manipulation_toolbox/resources/linux64/container.so,sha256=BUOjgUqczpPVqVJYDUTiAGfEedk5NNwb_LAJ3fBo6_8,46080
 fmu_manipulation_toolbox/resources/linux64/server_sm,sha256=ulfoPvmaYe9nInYcVEyj7mD9zDzGk56OUoWx1mPKLiE,22768
-fmu_manipulation_toolbox/resources/win32/client_sm.dll,sha256=2rdjTnS5qIEXILEjlp2Sx2HmO0eB6Rgoq3j0eLJ3lNc,17920
-fmu_manipulation_toolbox/resources/win32/server_sm.exe,sha256=Q4FlXD4toZXKUiiIZkY1GvF3P8Rsv7_D9R5Nn0m73bs,15872
-fmu_manipulation_toolbox/resources/win64/client_sm.dll,sha256=hbq9h5tsuCwAx0HBWxNOM5wilOojsPnGh4q2DaSAZlk,22016
-fmu_manipulation_toolbox/resources/win64/container.dll,sha256=GIDuHU8OQ1X33CI-hzHTBI00wVAUDhdLR-Calq3HqkA,36864
-fmu_manipulation_toolbox/resources/win64/server_sm.exe,sha256=jswWUcJu6EbP8lTaLMvlVLyeU1wtndaBpla237HBM64,19456
-fmu_manipulation_toolbox-1.8.2rc2.dist-info/LICENSE.txt,sha256=c_862mzyk6ownO3Gt6cVs0-53IXLi_-ZEQFNDVabESw,1285
-fmu_manipulation_toolbox-1.8.2rc2.dist-info/METADATA,sha256=rURX1AikSzeTW-Qs7D2Xn_nUgB9V8D0lCLcQnX6s86g,1066
-fmu_manipulation_toolbox-1.8.2rc2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-fmu_manipulation_toolbox-1.8.2rc2.dist-info/entry_points.txt,sha256=jCPLMBdS-eOvmRfDv7n0wHZSbJHccHviW03mz5vwO-Q,124
-fmu_manipulation_toolbox-1.8.2rc2.dist-info/top_level.txt,sha256=9D_h-5BMjSqf9z-XFkbJL_bMppR2XNYW3WNuPkXou0k,25
-fmu_manipulation_toolbox-1.8.2rc2.dist-info/RECORD,,
+fmu_manipulation_toolbox/resources/win32/client_sm.dll,sha256=9SIR_sMWsQoFcTXA4LnLhc2DZurXq8bXM0NydxVoZBY,17920
+fmu_manipulation_toolbox/resources/win32/server_sm.exe,sha256=p6J_w56qDlortkzGQeYBgPHlOU8l5Ojchi08tcbvEb4,15872
+fmu_manipulation_toolbox/resources/win64/client_sm.dll,sha256=aoT6FYurl8VUPedAbzUdNhcB60p7TPaIdfcA2U8UQ28,22016
+fmu_manipulation_toolbox/resources/win64/container.dll,sha256=xMTPDvfBhlSHHuPafX-6opHancrhChIpWqfUDmczNhQ,37888
+fmu_manipulation_toolbox/resources/win64/server_sm.exe,sha256=ultqGaqnF1m58BqkMJuv_FLksYtVHTFyZKTC8DCt5Bc,19456
+fmu_manipulation_toolbox-1.8.2.2.dist-info/licenses/LICENSE.txt,sha256=c_862mzyk6ownO3Gt6cVs0-53IXLi_-ZEQFNDVabESw,1285
+fmu_manipulation_toolbox-1.8.2.2.dist-info/METADATA,sha256=RxqQOa8BudLur3X7aHCXTJ9Q7kg_iszk-WCtYHX-gtU,1087
+fmu_manipulation_toolbox-1.8.2.2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+fmu_manipulation_toolbox-1.8.2.2.dist-info/entry_points.txt,sha256=jCPLMBdS-eOvmRfDv7n0wHZSbJHccHviW03mz5vwO-Q,124
+fmu_manipulation_toolbox-1.8.2.2.dist-info/top_level.txt,sha256=9D_h-5BMjSqf9z-XFkbJL_bMppR2XNYW3WNuPkXou0k,25
+fmu_manipulation_toolbox-1.8.2.2.dist-info/RECORD,,

{fmu_manipulation_toolbox-1.8.2rc2.dist-info → fmu_manipulation_toolbox-1.8.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any