Skip to content
Snippets Groups Projects
  1. Oct 22, 2021
    • Andreas Dedner's avatar
      refactored the python cmake module files: · 875ee5f8
      Andreas Dedner authored
      - 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).
      875ee5f8
    • Andreas Dedner's avatar
      use an external venv if active · e6d72f8f
      Andreas Dedner authored
      e6d72f8f
    • Andreas Dedner's avatar
      pep 42: use implicit namespace packages which make it possible to combine... · 79359e69
      Andreas Dedner authored
      pep 42: use implicit namespace packages which make it possible to combine subpackages using editable (source) and non editable (pypi)
      79359e69
    • Andreas Dedner's avatar
      improve locking mechanism when generating dune-py · d01b38db
      Andreas Dedner authored
      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
      d01b38db
    • Andreas Dedner's avatar
    • Andreas Dedner's avatar
      ddd52883
    • Andreas Dedner's avatar
      Add a 'flag' argument to the 'dune_python_install_package' command which... · 25f0d448
      Andreas Dedner authored
      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
      25f0d448
    • Andreas Dedner's avatar
      all dune modules are searched at the beginning now possibly before dune-py has · 29a86282
      Andreas Dedner authored
      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
      29a86282
  2. Oct 21, 2021
  3. Oct 19, 2021
  4. Oct 15, 2021
  5. Oct 14, 2021
Loading