-
- Downloads
all dune modules are searched at the beginning now possibly before dune-py has
been constructed. The __init__.py file in dune.grid uses 'haveAssert' to check if 'AlbertaGrid' is available. This checks 'config.h' in dune-py which caused an error. The fix here simply return 'False' in case dune-py/config.h is not available. correctly use the tagfile '.noconfigure' to make sure dune-py is rebuild each time a new dune module is installed. To avoid a 'recursive include' issue moved the generation of dune-py based on the 'template' to the 'Builder' (where it was before). Also fixed a bug (which was partially a feature avoiding recursive includes up until now): there was a script dune/generator/builder.py which contained the 'Builder' class and in dune/generator/__init__.py we setup a variable 'builder' which then shadowed the script. This did then cause problems in one place. Renaming the 'builder.py' script then demonstrated the issue with the recursive import. use *.template for dune-py template files which should be copied without the ending, e.g., CMakeLists.txt (now CMakeLists.txt.template) Also renamed dune.module to dune.module.template to be certain that it will not be picked up by mistake add cmake install command for the cmake_metadata files and the files in the dune-py template to make sure that skbuild adds them correctly to the wheel check for matplotlib in dune.plotting Partial fix for export of build dirs for all deps modules to metadat file. In previous version only first builddir was written. Issue with this version: space is used to separate the directories. Also make dune-py depend on modules without their own python package if another module (with bindings) depends on it. minor fixes
Showing
- bin/dunepackaging.py 9 additions, 1 deletionbin/dunepackaging.py
- cmake/modules/DunePythonInstallPackage.cmake 37 additions, 12 deletionscmake/modules/DunePythonInstallPackage.cmake
- cmake/modules/DunePythonMacros.cmake 3 additions, 3 deletionscmake/modules/DunePythonMacros.cmake
- cmake/modules/DunePythonVirtualenv.cmake 1 addition, 1 deletioncmake/modules/DunePythonVirtualenv.cmake
- python/dune/common/checkconfiguration.py 1 addition, 0 deletionspython/dune/common/checkconfiguration.py
- python/dune/generator/CMakeLists.txt 3 additions, 3 deletionspython/dune/generator/CMakeLists.txt
- python/dune/generator/__init__.py 2 additions, 121 deletionspython/dune/generator/__init__.py
- python/dune/generator/cmakebuilder.py 152 additions, 22 deletionspython/dune/generator/cmakebuilder.py
- python/dune/generator/template/CMakeLists.txt 4 additions, 26 deletionspython/dune/generator/template/CMakeLists.txt
- python/dune/generator/template/CMakeLists.txt.template 27 additions, 0 deletionspython/dune/generator/template/CMakeLists.txt.template
- python/dune/generator/template/dune.module.template 0 additions, 0 deletionspython/dune/generator/template/dune.module.template
- python/dune/generator/template/python/CMakeLists.txt 1 addition, 0 deletionspython/dune/generator/template/python/CMakeLists.txt
- python/dune/generator/template/python/dune/CMakeLists.txt 1 addition, 0 deletionspython/dune/generator/template/python/dune/CMakeLists.txt
- python/dune/generator/template/python/dune/generated/CMakeLists.txt 3 additions, 1 deletion...e/generator/template/python/dune/generated/CMakeLists.txt
- python/dune/generator/template/python/dune/generated/CMakeLists.txt.template 1 addition, 0 deletions...or/template/python/dune/generated/CMakeLists.txt.template
- python/dune/packagemetadata.py 0 additions, 1 deletionpython/dune/packagemetadata.py
- python/dune/plotting.py 271 additions, 263 deletionspython/dune/plotting.py
- setup.py 1 addition, 1 deletionsetup.py
Loading
Please register or sign in to comment