pythonfmu3 0.2.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

pythonfmu3/tests/slaves/slavewithdep.py

@@ -1,21 +1,21 @@
-import math
-from pythonfmu3.fmi3slave import Fmi3Slave, Fmi3Causality, Float64, Fmi3Variability
-from localmodule import get_amplitude, get_time_constant
-
-
-class PythonSlaveWithDep(Fmi3Slave):
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-        self.realIn = 22.0
-        self.realOut = 0.0
-        self.time = 0
-
-        self.register_variable(Float64("time", causality=Fmi3Causality.independent, variability=Fmi3Variability.continuous))
-        self.register_variable(Float64("realIn", causality=Fmi3Causality.input))
-        self.register_variable(Float64("realOut", causality=Fmi3Causality.output))
-
-    def do_step(self, current_time, step_size):
-        self.realOut = self.realIn * get_amplitude() * math.exp((current_time + step_size) / get_time_constant())
-        return True
+import math
+from pythonfmu3.fmi3slave import Fmi3Slave, Fmi3Causality, Float64, Fmi3Variability
+from localmodule import get_amplitude, get_time_constant
+
+
+class PythonSlaveWithDep(Fmi3Slave):
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        self.realIn = 22.0
+        self.realOut = 0.0
+        self.time = 0
+
+        self.register_variable(Float64("time", causality=Fmi3Causality.independent, variability=Fmi3Variability.continuous))
+        self.register_variable(Float64("realIn", causality=Fmi3Causality.input))
+        self.register_variable(Float64("realOut", causality=Fmi3Causality.output))
+
+    def do_step(self, current_time, step_size):
+        self.realOut = self.realIn * get_amplitude() * math.exp((current_time + step_size) / get_time_constant())
+        return True

pythonfmu3/tests/test_builder.py

@@ -1,195 +1,195 @@
-import itertools
-import platform
-import tempfile
-import zipfile
-from pathlib import Path
-
-import pytest
-
-import pythonfmu3
-from pythonfmu3.builder import FmuBuilder, get_platform
-
-PROJECT_TEST_CASES = [
-    ("dummy.txt",),
-    ("dummy.py", "subdir/dummy.txt"),
-    ("dummy.py", "subdir/dummy.txt", "subdir/dummy2.txt"),
-    ("dummy.py", "subdir/dummy.txt", "subdir2/dummy2.txt"),
-]
-
-
-lib_extension = ({"Darwin": "dylib", "Linux": "so", "Windows": "dll"}).get(
-    platform.system(), None
-)
-
-
-def test_zip_content(tmp_path):
-
-    script_name = "pythonslave.py"
-    script_file = Path(__file__).parent / "slaves" / script_name
-    fmu = FmuBuilder.build_FMU(script_file, dest=tmp_path)
-    assert fmu.exists()
-    assert zipfile.is_zipfile(fmu)
-
-    with zipfile.ZipFile(fmu) as files:
-        names = files.namelist()
-
-        assert "modelDescription.xml" in names
-        assert "/".join(("resources", script_name)) in names
-        module_file = "/".join(("resources", "slavemodule.txt"))
-        assert module_file in names
-
-        nfiles = 20
-        if FmuBuilder.has_binary():
-            assert (
-                "/".join(("binaries", get_platform(), f"PythonSlave.{lib_extension}"))
-                in names
-            )
-        else:
-            nfiles -= 1
-
-        # Check sources
-        src_folder = Path(pythonfmu3.__path__[0]) / "pythonfmu-export"
-        for f in itertools.chain(
-            src_folder.rglob("*.hpp"),
-            src_folder.rglob("*.cpp"),
-            src_folder.rglob("CMakeLists.txt"),
-        ):
-            if "build" in f.parts:
-                continue
-            assert "/".join(("sources", f.relative_to(src_folder).as_posix())) in names
-
-        # Check pythonfmu is embedded
-        pkg_folder = Path(pythonfmu3.__path__[0])
-        for f in pkg_folder.rglob("*.py"):
-            relative_f = f.relative_to(pkg_folder).as_posix()
-            if "test" not in relative_f:
-                assert "/".join(("resources", "pythonfmu3", relative_f)) in names
-
-        assert len(names) >= nfiles  # Library + python script + XML + module name + sources
-
-        with files.open(module_file) as myfile:
-            assert myfile.read() == b"pythonslave"
-
-
-@pytest.mark.parametrize("pfiles", PROJECT_TEST_CASES)
-def test_project_files(tmp_path, pfiles):
-    pfiles = map(Path, pfiles)
-    script_file = Path(__file__).parent / "slaves/pythonslave.py"
-    def build():
-        with tempfile.TemporaryDirectory() as project_dir:
-            project_dir = Path(project_dir)
-
-            project_files = set()
-            for f in pfiles:
-                full_name = project_dir / f
-                if full_name.suffix:
-                    full_name.parent.mkdir(parents=True, exist_ok=True)
-                    full_name.write_text("dummy content")
-                else:
-                    full_name.mkdir(parents=True, exist_ok=True)
-
-                # Add subfolder and not file if common parent exits
-                to_remove = None
-                for p in project_files:
-                    if p.parent == full_name.parent or p == full_name.parent:
-                        to_remove = p
-                        break
-                if to_remove is None:
-                    project_files.add(full_name)
-                else:
-                    project_files.remove(to_remove)
-                    project_files.add(full_name.parent)
-
-            return FmuBuilder.build_FMU(script_file, dest=tmp_path, project_files=project_files)
-
-    fmu = build()
-    with zipfile.ZipFile(fmu) as files:
-        names = files.namelist()
-
-        parents = [p.parent for p in pfiles]
-        unique_folders = set(parents)
-        common_parents = set()
-        if len(unique_folders) < len(parents):
-            common_parents = set(filter(lambda f: parents.count(f) > 1, unique_folders))
-
-            pfiles = map(lambda f: f if f.parent in common_parents else f.name, pfiles)
-
-        for pfile in pfiles:
-            assert f"resources/{pfile!s}" in names
-
-
-@pytest.mark.parametrize("pfiles", PROJECT_TEST_CASES)
-def test_project_files_containing_script(tmp_path, pfiles):
-    orig_script_file = Path(__file__).parent / "slaves/pythonslave.py"
-    pfiles = map(Path, pfiles)
-
-    def build():
-        with tempfile.TemporaryDirectory() as project_dir:
-            project_dir = Path(project_dir)
-            script_file = project_dir / "slave.py"
-            with open(orig_script_file) as script_f:
-                script_file.write_text(script_f.read())
-
-            for f in pfiles:
-                full_name = project_dir / f
-                if full_name.suffix:
-                    full_name.parent.mkdir(parents=True, exist_ok=True)
-                    full_name.write_text("dummy content")
-                else:
-                    full_name.mkdir(parents=True, exist_ok=True)
-
-            return FmuBuilder.build_FMU(
-                script_file, dest=tmp_path, project_files=[script_file.parent]
-            )
-
-    fmu = build()
-    with zipfile.ZipFile(fmu) as files:
-        names = files.namelist()
-
-        parents = [p.parent for p in pfiles]
-        unique_folders = set(parents)
-        common_parents = set()
-        if len(unique_folders) < len(parents):
-            common_parents = set(filter(lambda f: parents.count(f) > 1, unique_folders))
-
-            pfiles = map(lambda f: f if f.parent in common_parents else f.name, pfiles)
-
-        for pfile in pfiles:
-            assert f"resources/{pfile!s}" in names
-
-
-def test_documentation(tmp_path):
-    script_file = Path(__file__).parent / "slaves/pythonslave.py"
-    def build():
-        with tempfile.TemporaryDirectory() as documentation_dir:
-            doc_dir = Path(documentation_dir)
-            license_file = doc_dir / "licenses" / "license.txt"
-            license_file.parent.mkdir()
-            license_file.write_text("Dummy license")
-            index_file = doc_dir / "index.html"
-            index_file.write_text("dummy index")
-            return FmuBuilder.build_FMU(script_file, dest=tmp_path, documentation_folder=doc_dir)
-
-    fmu = build()
-    with zipfile.ZipFile(fmu) as files:
-        names = files.namelist()
-
-        assert "documentation/index.html" in names
-        assert "documentation/licenses/license.txt" in names
-
-
-def test_terminals(tmp_path):
-    script_file = Path(__file__).parent / "slaves/pythonslave.py"
-    def build():
-        with tempfile.TemporaryDirectory() as terminals_dir:
-            terminals_dir = Path(terminals_dir)
-            terminals = terminals_dir / "terminalsAndIcons.xml"
-            terminals.write_text("Dummy Terminal 1")
-
-            return FmuBuilder.build_FMU(script_file, dest=tmp_path, terminals=terminals)
-
-    fmu = build()
-    with zipfile.ZipFile(fmu) as files:
-        names = files.namelist()
-
-        assert "terminalsAndIcons/terminalsAndIcons.xml" in names
+import itertools
+import platform
+import tempfile
+import zipfile
+from pathlib import Path
+
+import pytest
+
+import pythonfmu3
+from pythonfmu3.builder import FmuBuilder, get_platform
+
+PROJECT_TEST_CASES = [
+    ("dummy.txt",),
+    ("dummy.py", "subdir/dummy.txt"),
+    ("dummy.py", "subdir/dummy.txt", "subdir/dummy2.txt"),
+    ("dummy.py", "subdir/dummy.txt", "subdir2/dummy2.txt"),
+]
+
+
+lib_extension = ({"Darwin": "dylib", "Linux": "so", "Windows": "dll"}).get(
+    platform.system(), None
+)
+
+
+def test_zip_content(tmp_path):
+
+    script_name = "pythonslave.py"
+    script_file = Path(__file__).parent / "slaves" / script_name
+    fmu = FmuBuilder.build_FMU(script_file, dest=tmp_path)
+    assert fmu.exists()
+    assert zipfile.is_zipfile(fmu)
+
+    with zipfile.ZipFile(fmu) as files:
+        names = files.namelist()
+
+        assert "modelDescription.xml" in names
+        assert "/".join(("resources", script_name)) in names
+        module_file = "/".join(("resources", "slavemodule.txt"))
+        assert module_file in names
+
+        nfiles = 20
+        if FmuBuilder.has_binary():
+            assert (
+                "/".join(("binaries", get_platform(), f"PythonSlave.{lib_extension}"))
+                in names
+            )
+        else:
+            nfiles -= 1
+
+        # Check sources
+        src_folder = Path(pythonfmu3.__path__[0]) / "pythonfmu-export"
+        for f in itertools.chain(
+            src_folder.rglob("*.hpp"),
+            src_folder.rglob("*.cpp"),
+            src_folder.rglob("CMakeLists.txt"),
+        ):
+            if "build" in f.parts:
+                continue
+            assert "/".join(("sources", f.relative_to(src_folder).as_posix())) in names
+
+        # Check pythonfmu is embedded
+        pkg_folder = Path(pythonfmu3.__path__[0])
+        for f in pkg_folder.rglob("*.py"):
+            relative_f = f.relative_to(pkg_folder).as_posix()
+            if "test" not in relative_f:
+                assert "/".join(("resources", "pythonfmu3", relative_f)) in names
+
+        assert len(names) >= nfiles  # Library + python script + XML + module name + sources
+
+        with files.open(module_file) as myfile:
+            assert myfile.read() == b"pythonslave"
+
+
+@pytest.mark.parametrize("pfiles", PROJECT_TEST_CASES)
+def test_project_files(tmp_path, pfiles):
+    pfiles = map(Path, pfiles)
+    script_file = Path(__file__).parent / "slaves/pythonslave.py"
+    def build():
+        with tempfile.TemporaryDirectory() as project_dir:
+            project_dir = Path(project_dir)
+
+            project_files = set()
+            for f in pfiles:
+                full_name = project_dir / f
+                if full_name.suffix:
+                    full_name.parent.mkdir(parents=True, exist_ok=True)
+                    full_name.write_text("dummy content")
+                else:
+                    full_name.mkdir(parents=True, exist_ok=True)
+
+                # Add subfolder and not file if common parent exits
+                to_remove = None
+                for p in project_files:
+                    if p.parent == full_name.parent or p == full_name.parent:
+                        to_remove = p
+                        break
+                if to_remove is None:
+                    project_files.add(full_name)
+                else:
+                    project_files.remove(to_remove)
+                    project_files.add(full_name.parent)
+
+            return FmuBuilder.build_FMU(script_file, dest=tmp_path, project_files=project_files)
+
+    fmu = build()
+    with zipfile.ZipFile(fmu) as files:
+        names = files.namelist()
+
+        parents = [p.parent for p in pfiles]
+        unique_folders = set(parents)
+        common_parents = set()
+        if len(unique_folders) < len(parents):
+            common_parents = set(filter(lambda f: parents.count(f) > 1, unique_folders))
+
+            pfiles = map(lambda f: f if f.parent in common_parents else f.name, pfiles)
+
+        for pfile in pfiles:
+            assert f"resources/{pfile!s}" in names
+
+
+@pytest.mark.parametrize("pfiles", PROJECT_TEST_CASES)
+def test_project_files_containing_script(tmp_path, pfiles):
+    orig_script_file = Path(__file__).parent / "slaves/pythonslave.py"
+    pfiles = map(Path, pfiles)
+
+    def build():
+        with tempfile.TemporaryDirectory() as project_dir:
+            project_dir = Path(project_dir)
+            script_file = project_dir / "slave.py"
+            with open(orig_script_file) as script_f:
+                script_file.write_text(script_f.read())
+
+            for f in pfiles:
+                full_name = project_dir / f
+                if full_name.suffix:
+                    full_name.parent.mkdir(parents=True, exist_ok=True)
+                    full_name.write_text("dummy content")
+                else:
+                    full_name.mkdir(parents=True, exist_ok=True)
+
+            return FmuBuilder.build_FMU(
+                script_file, dest=tmp_path, project_files=[script_file.parent]
+            )
+
+    fmu = build()
+    with zipfile.ZipFile(fmu) as files:
+        names = files.namelist()
+
+        parents = [p.parent for p in pfiles]
+        unique_folders = set(parents)
+        common_parents = set()
+        if len(unique_folders) < len(parents):
+            common_parents = set(filter(lambda f: parents.count(f) > 1, unique_folders))
+
+            pfiles = map(lambda f: f if f.parent in common_parents else f.name, pfiles)
+
+        for pfile in pfiles:
+            assert f"resources/{pfile!s}" in names
+
+
+def test_documentation(tmp_path):
+    script_file = Path(__file__).parent / "slaves/pythonslave.py"
+    def build():
+        with tempfile.TemporaryDirectory() as documentation_dir:
+            doc_dir = Path(documentation_dir)
+            license_file = doc_dir / "licenses" / "license.txt"
+            license_file.parent.mkdir()
+            license_file.write_text("Dummy license")
+            index_file = doc_dir / "index.html"
+            index_file.write_text("dummy index")
+            return FmuBuilder.build_FMU(script_file, dest=tmp_path, documentation_folder=doc_dir)
+
+    fmu = build()
+    with zipfile.ZipFile(fmu) as files:
+        names = files.namelist()
+
+        assert "documentation/index.html" in names
+        assert "documentation/licenses/license.txt" in names
+
+
+def test_terminals(tmp_path):
+    script_file = Path(__file__).parent / "slaves/pythonslave.py"
+    def build():
+        with tempfile.TemporaryDirectory() as terminals_dir:
+            terminals_dir = Path(terminals_dir)
+            terminals = terminals_dir / "terminalsAndIcons.xml"
+            terminals.write_text("Dummy Terminal 1")
+
+            return FmuBuilder.build_FMU(script_file, dest=tmp_path, terminals=terminals)
+
+    fmu = build()
+    with zipfile.ZipFile(fmu) as files:
+        names = files.namelist()
+
+        assert "terminalsAndIcons/terminalsAndIcons.xml" in names

pythonfmu3/tests/test_deploy.py

@@ -1,48 +1,48 @@
-from pathlib import Path
-from tempfile import TemporaryDirectory
-from unittest.mock import patch
-
-import pytest
-
-from pythonfmu3.builder import FmuBuilder
-from pythonfmu3.deploy import deploy
-
-PYTHON_SLAVE = Path(__file__).parent / "slaves/pythonslave.py"
-
-@pytest.mark.parametrize("test_manager", [None, "pip", "conda"])
-@pytest.mark.parametrize(
-    "requirements, test_requirements, expected", [
-        (None, None, ValueError),
-        (None, "requirements.txt", ValueError),
-        (None, "environment.yaml", ValueError),
-        ("requirements.txt", None, "pip"),
-        ("environment.yaml", None, "conda"),
-        ("environment.yml", None, "conda"),
-        ("req.txt", "req.txt", "pip"),
-        ("env.yml", "env.yml", "conda"),
-    ]
-)
-def test_deploy(tmp_path, test_manager, requirements, test_requirements, expected):
-
-    dummy_requirements = """numpy=1.16
-scipy
-"""
-    if requirements is not None:
-        with TemporaryDirectory() as tempd:
-            requirements_file = Path(tempd) / requirements
-            requirements_file.write_text(dummy_requirements)
-            fmu = FmuBuilder.build_FMU(PYTHON_SLAVE, dest=tmp_path, project_files=[requirements_file, ])
-    else:
-        fmu = FmuBuilder.build_FMU(PYTHON_SLAVE, dest=tmp_path)
-    assert fmu.exists()
-
-    with patch("subprocess.run") as run:
-        if isinstance(expected, type) and issubclass(expected, Exception):
-            with pytest.raises(expected):
-                deploy(fmu, environment=test_requirements, package_manager=test_manager)
-            run.assert_not_called()
-        else:
-            deploy(fmu, environment=test_requirements, package_manager=test_manager)
-
-            run.assert_called_once()
-            assert (test_manager or expected) in " ".join(run.call_args[0][0])
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from unittest.mock import patch
+
+import pytest
+
+from pythonfmu3.builder import FmuBuilder
+from pythonfmu3.deploy import deploy
+
+PYTHON_SLAVE = Path(__file__).parent / "slaves/pythonslave.py"
+
+@pytest.mark.parametrize("test_manager", [None, "pip", "conda"])
+@pytest.mark.parametrize(
+    "requirements, test_requirements, expected", [
+        (None, None, ValueError),
+        (None, "requirements.txt", ValueError),
+        (None, "environment.yaml", ValueError),
+        ("requirements.txt", None, "pip"),
+        ("environment.yaml", None, "conda"),
+        ("environment.yml", None, "conda"),
+        ("req.txt", "req.txt", "pip"),
+        ("env.yml", "env.yml", "conda"),
+    ]
+)
+def test_deploy(tmp_path, test_manager, requirements, test_requirements, expected):
+
+    dummy_requirements = """numpy=1.16
+scipy
+"""
+    if requirements is not None:
+        with TemporaryDirectory() as tempd:
+            requirements_file = Path(tempd) / requirements
+            requirements_file.write_text(dummy_requirements)
+            fmu = FmuBuilder.build_FMU(PYTHON_SLAVE, dest=tmp_path, project_files=[requirements_file, ])
+    else:
+        fmu = FmuBuilder.build_FMU(PYTHON_SLAVE, dest=tmp_path)
+    assert fmu.exists()
+
+    with patch("subprocess.run") as run:
+        if isinstance(expected, type) and issubclass(expected, Exception):
+            with pytest.raises(expected):
+                deploy(fmu, environment=test_requirements, package_manager=test_manager)
+            run.assert_not_called()
+        else:
+            deploy(fmu, environment=test_requirements, package_manager=test_manager)
+
+            run.assert_called_once()
+            assert (test_manager or expected) in " ".join(run.call_args[0][0])