Have 'dunepackaging.py' add a 'is generated' comment to both setup.py and pyproject.toml.

See merge request !1032

This should be done in the other dune modules as well as some point.

refactor the way python is used in dune

See merge request !960

minor change to dune-py setup in corner case

reduce debug output a bit in the python dune generator

fix an issue with the dunepackaging script when called from installed dune.common

fix an issue with cmake configuration of dune-py after changing CMakeLists.txt - possible issue with cmake version

comment out CMP0087 NEW cmake policy because it fails on some CI runners

correctly set CMP0087 cmake policy to NEW for cmake >= 3.14

for additional CMAKE_FLAGS to use when setting up config.opts

[fix]

add a cmake flag to the configure call in dunecontrol containing the config.opts
file name This flag DUNE_OPTS_FILE is then added to the python package metadata which is then
used to build dune-py

change ci yml since python bindings now on by default

still need flag DUNE_RUNNING_IN_CI which is now turned on by default in CI config.opts file - this is used to set the index url to the gitlab registry for package download

test both turing of bindings and turning off python altogether in CI

make sure embeded test does not cause testing to fail if dune package could not be installed - this is not a perfect solution but works for now

exclude dune.src_dir from module load since this is a link set by cmake

replace assertHave with assertCMakeHave which has to be used slightly differently with the new dune-py setup process

remove use of forced keyword arguments again - already 'forced' by *args

Change the way the requirements are installed into the internal venv. They will now be installed during the configure stage. The actual dune package is installed only if requirements were installed successfully using --no-deps and --no-build-isolation. This way there is no failure if there is no internet connection.

slight change to previous approach: during configure install external packages (not dune modules), during installation of the dune package, locally available packages (wheelhouse) will be installed as well but with --no-index to avoid requiring internet access

add a parameter to provide extra cmake commands for a target to the 'module.load' method which are written directly into the CMakeLists.txt file in dune-py. This solves a problem with linking AlbertaGrid

Robert K authored 3 years ago and Andreas Dedner committed 3 years ago

output to console.

This requires an addition module_HASPYTHON flag in module-config.cmake

add a MODULE_HASPYTHON variable

added a 'WARNING_MESSAGE' parameter to 'dune_execute_process' to obtain information about failed commands without failing the whole cmake run

fix some issues with installed packages

fix an issue with the wheelhouse path set in the wrong cmake module

Fix dunepackaging.

using the same additional parameters for both the inernal (editable) install and the global install could lead to problems. So for now use the DUNE_ADDITIONAL_PIP_PARAMS only for the global install - we might have to add additional cmake variables to separete the two cases

- moved some parts relating to the venv out of PythonCommonMacros to Virtualenv
- removed PythonMacros file
- use an external active env instead of generating a new internal one.
  Also added some checks to avoid a user mixing up different builds within the same env
- finally made some changes on how and when the dune-py module is regenerated

some minor fixes

[testing] ci with index-url set

remove extra-index-url from pip install

add a stopgap solution unti ci repo up and running again

we need pip>=21 so that 'make', 'make install_python', 'make' does not
mess up the packages in an external env (with older versions of pip
the last 'make' wouldn't correctly remove the non editable install).

pep 42: use implicit namespace packages which make it possible to combine subpackages using editable (source) and non editable (pypi)

use clang 10-20 for python test since some other parallel tests fail with the clang 10-17 toolchain

fix an issue with a double installation of the dune module in the case
of using packages (there was a 2.8.0 version and a dev version being added to the venv)

minor improvement to plotting

Add a 'flag' argument to the 'dune_python_install_package' command which contains cmake variables to store in metadata file.
This is to be used to fix for example the compiler to use for dune-py but that hasn't been added to the builder yet.
Also changed builddirs output to contain ';' separator (using a cmake string instead of a list).

added 'cmake flags' from metadata file to CMakeLists.txt.template

correctly throw exception if dune-py not available in assertHave

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

Dominic Kempf authored 4 years ago and Andreas Dedner committed 3 years ago

Install CMake scipt

Dominic Kempf authored 4 years ago and Andreas Dedner committed 3 years ago

Slightly refactor data processing and fix the common-install use case

Dominic Kempf authored 4 years ago and Andreas Dedner committed 3 years ago

All testing is done in the virtualenv.

Dominic Kempf authored 4 years ago and Andreas Dedner committed 3 years ago

It is not really necessary in the new interface.

Dominic Kempf authored 4 years ago and Andreas Dedner committed 3 years ago

This reduces the number of redundant reruns of the env installation.