Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing no longer required dependency on lxml #200

Merged
merged 1 commit into from
Oct 2, 2023
Merged

Removing no longer required dependency on lxml #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
--- 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.
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 3 additions & 5 deletions src/pyfmi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -58,7 +60,6 @@ def wrap(func):


def check_packages():
import sys, time
le=30
le_short=15
startstr = "Performing pyfmi package check"
Expand Down Expand Up @@ -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")
Expand All @@ -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:
Expand Down