Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
0fdea9f7
Commit
0fdea9f7
authored
3 years ago
by
Timo Koch
Browse files
Options
Downloads
Patches
Plain Diff
[python] Make work with changes from dune-common MR 1054
parent
84e5bec9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2937
Feature/python with dune 2.9
Pipeline
#11363
passed
3 years ago
Stage: trigger
Stage: downstream modules
+2
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
python/CMakeLists.txt
+1
-1
1 addition, 1 deletion
python/CMakeLists.txt
python/dumux/__init__.py
+6
-2
6 additions, 2 deletions
python/dumux/__init__.py
python/dumux/common/properties.py
+1
-1
1 addition, 1 deletion
python/dumux/common/properties.py
python/setup.py.in
+1
-1
1 addition, 1 deletion
python/setup.py.in
with
9 additions
and
5 deletions
python/CMakeLists.txt
+
1
−
1
View file @
0fdea9f7
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
python/dumux/__init__.py
+
6
−
2
View file @
0fdea9f7
...
...
@@ -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
This diff is collapsed.
Click to expand it.
python/dumux/common/properties.py
+
1
−
1
View file @
0fdea9f7
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
python/setup.py.in
+
1
−
1
View file @
0fdea9f7
...
...
@@ -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,
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment