diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a96af8d9..b016d882 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - name: Install system run: | - sudo apt-get -y install python3-scipy python3-setuptools python3-nose cython3 python3-matplotlib python3-lxml + sudo apt-get -y install python3-scipy python3-setuptools python3-nose cython3 python3-matplotlib sudo apt-get -y install cmake liblapack-dev libsuitesparse-dev libhypre-dev sudo cp -v /usr/lib/x86_64-linux-gnu/libblas.so /usr/lib/x86_64-linux-gnu/libblas_OPENMP.so - name: Install superlu diff --git a/CHANGELOG b/CHANGELOG index 998bc3f5..51f4f96a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,12 @@ --- CHANGELOG --- +--- PyFMI-NEXT_VERSION --- + * Removed utilities related to the obsolete FMUX model interface. + * Removed no longer required dependency on lxml. + --- PyFMI-2.11.0 --- * Refactored result handling for dynamic_diagnostics. It is now possible use dynamic_diagnostics with a custom result handler. * Migrated some diagnostics functionality into a new file: src/common/diagnostics.py. This should be seamless. - * pyfmi.common.diagnostics_prefix has been moved to pyfmi.common.diagnostics as DIAGNOSTICS_PREFIX. + * pyfmi.common.diagnostics_prefix has been moved to pyfmi.common.diagnostics as DIAGNOSTICS_PREFIX. --- PyFMI-2.10.4 --- * Added 'result_handling' = None as option, deprecated 'none'. @@ -49,7 +53,7 @@ --- PyFMI-2.9.7 --- * Added an argument to ResultDymolaBinary to allow for reading updated data from the loaded file. - * Added option "synchronize_simulation" to allow for synchronizing + * Added option "synchronize_simulation" to allow for synchronizing simulation with (scaled) real-time. --- PyFMI-2.9.6 --- diff --git a/setup.cfg b/setup.cfg index fbf495e8..c4a18de3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,6 +9,5 @@ install_requires = scipy >= 1.3 cython >= 0.29.13 nose >= 1.3.7 - lxml >= 4.4.1 matplotlib > 3 assimulo >= 3.2 \ No newline at end of file diff --git a/src/pyfmi/__init__.py b/src/pyfmi/__init__.py index 77a97ac9..6dee1238 100644 --- a/src/pyfmi/__init__.py +++ b/src/pyfmi/__init__.py @@ -28,6 +28,8 @@ from .fmi_extended import FMUModelME1Extended import numpy as N import os.path +import sys +import time int = N.int32 N.int = N.int32 @@ -58,7 +60,6 @@ def wrap(func): def check_packages(): - import sys, time le=30 le_short=15 startstr = "Performing pyfmi package check" @@ -102,7 +103,7 @@ def check_packages(): "%s %s" % (("-"*len(modstr)).ljust(le), ("-"*len(verstr)).ljust(le))) sys.stdout.write("\n") - packages=["assimulo", "Cython", "lxml", "matplotlib", "numpy", "scipy", "wxPython"] + packages=["assimulo", "Cython", "matplotlib", "numpy", "scipy", "wxPython"] if platform == "win32": packages.append("pyreadline") @@ -120,9 +121,6 @@ def check_packages(): try: if package == "pyreadline": vers = mod.release.version - elif package == "lxml": - from lxml import etree - vers = etree.__version__ else: vers = mod.__version__ except AttributeError: