pythonfmu3 0.1.17__py3-none-any.whl → 0.2.0__py3-none-any.whl

pythonfmu3/_version.py

@@ -1 +1 @@
-__version__ = "0.1.17"
+__version__ = "0.2.0"

pythonfmu3/builder.py

@@ -66,7 +66,7 @@ class FmuBuilder:
         dest: FilePath = ".",
         project_files: Iterable[FilePath] = set(),
         documentation_folder: Optional[FilePath] = None,
-        terminals_folder: Optional[FilePath] = None,
+        terminals : Optional[FilePath] = None,
         **options,
     ) -> Path:
         script_file = Path(script_file)
@@ -87,11 +87,15 @@ class FmuBuilder:
                     f"The documentation folder does not exists {documentation_folder!s}"
                 )
         
-        if terminals_folder is not None:
-            terminals_folder = Path(terminals_folder)
-            if not terminals_folder.exists():
+        if terminals is not None:
+            terminals = Path(terminals)
+            if not terminals.exists():
                 raise ValueError(
-                    f"The terminals folder does not exists {terminals_folder!s}"
+                    f"The specified terminalsAndIcons file does not exists {terminals!s}"
+                )
+            if not terminals.name == "terminalsAndIcons.xml":
+                raise ValueError(
+                    f"Incorrect terminal name {terminals!s}. Terminal file must be named terminalsAndIcons.xml"
                 )
 
         module_name = script_file.stem
@@ -186,12 +190,10 @@ class FmuBuilder:
                             relative_f = f.relative_to(documentation_folder)
                             zip_fmu.write(f, arcname=(documentation / relative_f))
 
-                if terminals_folder is not None:
-                    terminals = Path("terminalsAndIcons")
-                    for f in terminals_folder.rglob("*.xml"):
-                        if f.is_file():
-                            relative_f = f.relative_to(terminals_folder)
-                            zip_fmu.write(f, arcname=(terminals / relative_f))
+                if terminals is not None:
+                    terminalsFolder = Path("terminalsAndIcons")
+                    relative_f = terminals.relative_to(terminals.parent)
+                    zip_fmu.write(f, arcname=(terminalsFolder / relative_f))
                     
 
                 # Add the model description
@@ -233,8 +235,8 @@ def create_command_parser(parser: argparse.ArgumentParser):
 
     parser.add_argument(
         "--terminals",
-        dest="terminals_folder",
-        help="Folder containing terminals to include in the FMU.",
+        dest="terminals",
+        help="Terminals file (terminalsAndIcons.xml) to include in the FMU.",
         default=None
     )
 

pythonfmu3/pythonfmu-export/src/CMakeLists.txt

@@ -26,10 +26,11 @@ target_include_directories(pythonfmu-export
         "${CMAKE_CURRENT_SOURCE_DIR}"
         )
 
-target_link_libraries(pythonfmu-export
-        PRIVATE
-        ${Python3_LIBRARIES}
-        )
+if (WIN32)
+  target_link_libraries(pythonfmu-export PRIVATE ${Python3_LIBRARIES})
+elseif (APPLE)
+  set_target_properties(pythonfmu-export PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+endif ()
 
 if (WIN32)
   set_target_properties(pythonfmu-export

pythonfmu3/tests/test_builder.py

@@ -183,16 +183,13 @@ def test_terminals(tmp_path):
     def build():
         with tempfile.TemporaryDirectory() as terminals_dir:
             terminals_dir = Path(terminals_dir)
-            terminal1 = terminals_dir / "terminal1.xml"
-            terminal1.write_text("Dummy Terminal 1")
+            terminals = terminals_dir / "terminalsAndIcons.xml"
+            terminals.write_text("Dummy Terminal 1")
 
-            terminal2 = terminals_dir / "terminal2.xml"
-            terminal2.write_text("Dummy Terminal 2")
-            return FmuBuilder.build_FMU(script_file, dest=tmp_path, terminals_folder=terminals_dir)
+            return FmuBuilder.build_FMU(script_file, dest=tmp_path, terminals=terminals)
 
     fmu = build()
     with zipfile.ZipFile(fmu) as files:
         names = files.namelist()
 
-        assert "terminalsAndIcons/terminal1.xml" in names
-        assert "terminalsAndIcons/terminal2.xml" in names
+        assert "terminalsAndIcons/terminalsAndIcons.xml" in names

{pythonfmu3-0.1.17.dist-info → pythonfmu3-0.2.0.dist-info}/LICENSE

@@ -2,6 +2,7 @@ MIT License
 
 Copyright (c) 2019-2020 NTNU - Department of Ocean Operations and Civil Engineering
 Copyright (c) 2019-2020 Safran SA
+Copyright (c) 2023 Stephen Smith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{pythonfmu3-0.1.17.dist-info → pythonfmu3-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pythonfmu3
-Version: 0.1.17
+Version: 0.2.0
 Summary: A lightweight framework that enables the packaging of Python3.x code as co-simulation FMUs.
 Home-page: https://github.com/stephensmith25/PythonFMU3
 Author: Stephen Smith
@@ -62,7 +62,7 @@ pip install pythonfmu3
 3. Run `pythonfmu3 build` to create the fmu.
 
 ```
-usage: pythonfmu3 build [-h] -f SCRIPT_FILE [-d DEST] [--doc DOCUMENTATION_FOLDER] [--terminals TERMINALS_FOLDER] [--no-external-tool]
+usage: pythonfmu3 build [-h] -f SCRIPT_FILE [-d DEST] [--doc DOCUMENTATION_FOLDER] [--terminals TERMINALS_FILE] [--no-external-tool]
                        [--no-variable-step] [--interpolate-inputs] [--only-one-per-process] [--handle-state]
                        [--serialize-state] [--use-memory-management]
                        [Project files [Project files ...]]
@@ -79,8 +79,8 @@ optional arguments:
   -d DEST, --dest DEST  Where to save the FMU.
   --doc DOCUMENTATION_FOLDER
                         Documentation folder to include in the FMU.
-  --terminals TERMINALS_FOLDER
-                        Folder of terminals to include in the FMU.
+  --terminals TERMINALS_FILE
+                        Terminals file (terminalsAndIcons.xml) to include in the FMU.
   --no-external-tool    If given, needsExecutionTool=false
   --no-variable-step    If given, canHandleVariableCommunicationStepSize=false
   --interpolate-inputs  If given, canInterpolateInputs=true

{pythonfmu3-0.1.17.dist-info → pythonfmu3-0.2.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pythonfmu3/__init__.py,sha256=oN-2oXyCFwq0gvL2IEf5QvwIXBXZgsSBwAJw7LZ9vzc,424
 pythonfmu3/__main__.py,sha256=gC1T8x2d02hhqshyNQGSS70SyCk-3I3t8zPqoRo2Xd8,1543
-pythonfmu3/_version.py,sha256=BzIjnki8Bz3evNWo6bjGxxpLhy_tN9MRYhtM0MnDiWs,23
-pythonfmu3/builder.py,sha256=ZW-ig7GkWlwGrQ3z8wVsL6j7S6bynWLtL50Sw__M_og,9679
+pythonfmu3/_version.py,sha256=Zn1KFblwuFHiDRdRAiRnDBRkbPttWh44jKa5zG2ov0E,22
+pythonfmu3/builder.py,sha256=d_nTRWKohZrZsMbTmxiYJzszzVBp-CRisV_y_OVyW6U,9779
 pythonfmu3/default_experiment.py,sha256=FJ0l0FpU7pT4Pox2RiA2y-Cb_e7DE2XlbWKySRYQaVk,293
 pythonfmu3/deploy.py,sha256=eqFWVxZUkJCLvmq1-GuMNjn2j0VCGoaXPhRWrCk2Vxg,3741
 pythonfmu3/enums.py,sha256=ZmC6vGeBTGt7HarPQ4uYV10ezPsvIxAHH1ypjNq7G3E,729
@@ -15,7 +15,7 @@ pythonfmu3/pythonfmu-export/.clang-format,sha256=ApbsHWYwilCXJ1iBux4nqOjLkaqgbGL
 pythonfmu3/pythonfmu-export/CMakeLists.txt,sha256=p0-4Xh_sAaOI9AVb8lsUsMxJPc6bg9b_6CF6NJt5FHE,1847
 pythonfmu3/pythonfmu-export/build_unix.sh,sha256=I5RrF2O6y0hRG_SN4ExKN_CCFYaa2l-ngKzqmBXnHmA,73
 pythonfmu3/pythonfmu-export/build_win.sh,sha256=UzmAcWqFmwBu6mvYne2Dx3UK8iPwTtP4HpjICsjUaJA,97
-pythonfmu3/pythonfmu-export/src/CMakeLists.txt,sha256=RyjGhUUDhG_HEieCdt5WMfTR1snofOqigEKc83_zvfE,1104
+pythonfmu3/pythonfmu-export/src/CMakeLists.txt,sha256=fOVlV7hy9c0wx_Qp4K51tQaQ5xy9lL4qtyGl15ZXfGs,1208
 pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_common.hpp,sha256=cgrlZa5L-bbjZeVi0pmy4JKE5UJ2GszzuyOqTdRcBRQ,4353
 pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_cs.cpp,sha256=EsUIevwmCzX9hsui3i8x1crSnSOG8dEK15Zm1ZIavYQ,3843
 pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_cs.hpp,sha256=UmqAVAVE1KHNHMC8mIh8gIHRJ_aQk0Ma139TU6Kvv4o,6264
@@ -27,11 +27,11 @@ pythonfmu3/pythonfmu-export/src/pythonfmu/IPyState.hpp,sha256=GLiOjhKLDVEICersnq
 pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp,sha256=MpEUUcxPwoJlM_mW-9qxj4ezgKQd-CkDc2ud0mM7HbQ,25362
 pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.hpp,sha256=T-epGp68SjhDv-JupxUe2ZgnV8unU4htc-PUBokjWm4,4239
 pythonfmu3/pythonfmu-export/src/pythonfmu/PyState.hpp,sha256=CjFEIrZu8b1jxQAIgfI_o36hyItW_SdQ5VSkImf7JNs,2977
-pythonfmu3/resources/binaries/x86_64-linux/libpythonfmu-export.so,sha256=LLTlb6TDjJ24xuy7zhO5Sbj39nVzQSODkkXMXGl8Y7s,365224
-pythonfmu3/resources/binaries/x86_64-windows/pythonfmu-export.dll,sha256=b22hsx-MKU7vhYcbLViGyAfd0Jxv29sx0mxtWO3S7u0,430592
+pythonfmu3/resources/binaries/x86_64-linux/libpythonfmu-export.so,sha256=GBI4GQSCJn1YWkPWIIP9w5tAkyF7DM8aCwoNi-WygEc,365224
+pythonfmu3/resources/binaries/x86_64-windows/pythonfmu-export.dll,sha256=qMK-U8CTplgA2sgu-EHF5kzTeM3Vq5DeWzdtXiO7Tgw,430592
 pythonfmu3/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pythonfmu3/tests/conftest.py,sha256=B6XxTnBdeF_tEJ3w2DlfPKUfvlk-oULgIhQtXkgOJIc,171
-pythonfmu3/tests/test_builder.py,sha256=gxelTXyk03VreAy5ptQRQtl20IstO9eWTifTSvTceiE,7004
+pythonfmu3/tests/test_builder.py,sha256=GrD4ziin3RLOe_36rBQCMnKrSkhc3IqnxE1a6kCFPok,6842
 pythonfmu3/tests/test_deploy.py,sha256=JCDo-O93-izxrP9Q4K0njBcfZ-gAXYx9aZ4plgctz7k,1783
 pythonfmu3/tests/test_fmi3slave.py,sha256=1uwTdfiFZNmU0yzIdC30kAuu95xsZSTMA9CGk_Kdmm4,4304
 pythonfmu3/tests/test_integration.py,sha256=zA3iJ4rI2cKEE8mDsAmcVuwNWlJzhonV8Wxz92hzEac,10387
@@ -46,9 +46,9 @@ pythonfmu3/tests/slaves/localmodule.py,sha256=-q5Lmh2I88MG7nLTscms0n5xhHLkUDed1I
 pythonfmu3/tests/slaves/pythonslave.py,sha256=uzrTQmfk0QBalxNTviGMZNph_YgVmcbxPqKgX5rSvXg,2172
 pythonfmu3/tests/slaves/pythonslave_read_file.py,sha256=t2sDaZSr2veD91gdqCO9W9CN-AN3TyXABXXfV9Rt0Xs,791
 pythonfmu3/tests/slaves/slavewithdep.py,sha256=hHDFB0dw8wkHiGzxeAVbz9O5LR6ghsFeONgRFdiK_t0,812
-pythonfmu3-0.1.17.dist-info/LICENSE,sha256=24Cw_MPouLK-G_t8Hgjm59IS9BnPoL6SKkyuZ0xesXY,1155
-pythonfmu3-0.1.17.dist-info/METADATA,sha256=JnvWnoH6HzMnzQiBmd6P9J5goxKpqPdGYQcMO4Aalo4,7571
-pythonfmu3-0.1.17.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pythonfmu3-0.1.17.dist-info/entry_points.txt,sha256=GgkWYs0DKGHLcijMEYZGkhkHOK2RVUpjGwvl1fwyDwQ,60
-pythonfmu3-0.1.17.dist-info/top_level.txt,sha256=6ne7bh_cME1hepxCx1BG8N5QVhVAufrp7LLok6vq7nE,11
-pythonfmu3-0.1.17.dist-info/RECORD,,
+pythonfmu3-0.2.0.dist-info/LICENSE,sha256=RL2018BU2DKcTi8Eb4ODF-XF3wnr7SDKvMP5S49x4rQ,1188
+pythonfmu3-0.2.0.dist-info/METADATA,sha256=zPN-qU7jEfwtV4RAcYRXCMhpmrFJ9owZxfueBZVTdRQ,7585
+pythonfmu3-0.2.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pythonfmu3-0.2.0.dist-info/entry_points.txt,sha256=GgkWYs0DKGHLcijMEYZGkhkHOK2RVUpjGwvl1fwyDwQ,60
+pythonfmu3-0.2.0.dist-info/top_level.txt,sha256=6ne7bh_cME1hepxCx1BG8N5QVhVAufrp7LLok6vq7nE,11
+pythonfmu3-0.2.0.dist-info/RECORD,,