From 0fdea9f748861683b71e6066f7b0db96a56ef25c Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sat, 20 Nov 2021 16:46:51 +0100
Subject: [PATCH] [python] Make work with changes from dune-common MR 1054
---
python/CMakeLists.txt | 2 +-
python/dumux/__init__.py | 8 ++++++--
python/dumux/common/properties.py | 2 +-
python/setup.py.in | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index f34a5c5d5c..518173fdf8 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
if(${dune-common_VERSION} VERSION_GREATER_EQUAL 2.9)
dune_python_install_package(
PATH "."
- CMAKE_METADATA_FILE dumux/metadata.cmake
+ PACKAGENAME dumux
DEPENDS _common
CMAKE_METADATA_FLAGS DUNE_OPTS_FILE
)
diff --git a/python/dumux/__init__.py b/python/dumux/__init__.py
index 5bcb3ab2d1..0a1fd4f22b 100644
--- a/python/dumux/__init__.py
+++ b/python/dumux/__init__.py
@@ -11,10 +11,14 @@ https://dumux.org/
"""
try:
- from dune.common import registerExternalModule
+ from dune.packagemetadata import registerExternalModule
+ import pathlib
# register dumux to be recognized by dune-py (code generation module)
# as a module of the dune univers
- registerExternalModule("dumux")
+ registerExternalModule(
+ moduleName="dumux",
+ modulePath=str(pathlib.Path(__file__).parent.resolve()),
+ )
except ImportError:
pass
diff --git a/python/dumux/common/properties.py b/python/dumux/common/properties.py
index 0e791e1edb..a456c4de6a 100644
--- a/python/dumux/common/properties.py
+++ b/python/dumux/common/properties.py
@@ -151,7 +151,7 @@ def propertiesHeaderPath():
"""Find the path to the properties.hh C++ header"""
path, _ = os.path.split(dumux.__file__)
- metaDataFile = os.path.join(path, "data/metadata.cmake")
+ metaDataFile = os.path.join(path, "data/dumux.cmake")
if os.path.exists(metaDataFile):
data = {}
with open(metaDataFile, "r") as metaData:
diff --git a/python/setup.py.in b/python/setup.py.in
index 539ce130d7..1ec54395ef 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -10,7 +10,7 @@ setup(
author_email="${ProjectMaintainerEmail}",
packages=find_packages(),
zip_safe=0,
- package_data={"": ["*.so"]},
+ package_data={"": ["*.so"], "dumux": ["data/*.cmake"]},
install_requires=REQUIRED_PACKAGES,
include_package_data=True,
)
--
GitLab