CMakeLists.txt

-cmake_minimum_required(VERSION 3.1.3)
+cmake_minimum_required(VERSION 3.13)
 project(dune-codegen CXX)
 
 if(NOT (dune-common_DIR OR dune-common_ROOT OR

README.md

@@ -73,7 +73,6 @@ cmake. See the [Dune homepage][4] for further details. You need to set the optio
 
 ```
 -DDUNE_PYTHON_ALLOW_GET_PIP=1
--DDUNE_PYTHON_VIRTUALENV_SETUP=1
 ```
 
 in your options file. Your options file could for example look like
@@ -83,7 +82,6 @@ the following:
 CMAKE_FLAGS="
   -DDUNE_PYTHON_FORCE_PYTHON3=1
   -DDUNE_PYTHON_ALLOW_GET_PIP=1
-  -DDUNE_PYTHON_VIRTUALENV_SETUP=1
   -DCMAKE_BUILD_TYPE=Release
   -DCMAKE_CXX_FLAGS='-march=native -ffast-math'
   -DDUNE_SYMLINK_TO_SOURCE_TREE=1

bin/CMakeLists.txt

-dune_python_install_package(PATH .)
+dune_python_configure_package(PATH .)
 
 dune_symlink_to_source_files(FILES make_graph.sh
                                    knltimings.sh

cmake/modules/GeneratedSystemtests.cmake

@@ -180,7 +180,7 @@ function(dune_add_formcompiler_system_test)
         add_dependencies(build_${label}_tests ${tname})
       endforeach()
 
-      _add_test(NAME ${tname}
+      dune_add_test(TARGET ${tname}
                 COMMAND ${CMAKE_BINARY_DIR}/run-in-dune-env ${SYSTEMTEST_SCRIPT}
                 --exec "$<TARGET_FILE_DIR:${tname}>/$<TARGET_FILE_NAME:${tname}>"
                 --ini "${CMAKE_CURRENT_BINARY_DIR}/${inifile}"

python/CMakeLists.txt

@@ -6,14 +6,14 @@ dune_check_submodule(PATH loopy INDICATOR setup.py)
 dune_check_submodule(PATH ufl INDICATOR setup.py)
 
 # Install all the external packages that we have as submodules
-dune_python_install_package(PATH pytools)
-dune_python_install_package(PATH cgen)
-dune_python_install_package(PATH pymbolic)
-dune_python_install_package(PATH loopy)
-dune_python_install_package(PATH ufl)
+dune_python_configure_package(PATH pytools)
+dune_python_configure_package(PATH cgen)
+dune_python_configure_package(PATH pymbolic)
+dune_python_configure_package(PATH loopy)
+dune_python_configure_package(PATH ufl)
 
 # Install our python package
-dune_python_install_package(PATH .)
+dune_python_configure_package(PATH .)
 
 dune_python_add_test(NAME pep8-ourcode
                      MODULE pytest --flake8

python/dune/__init__.py

-__import__('pkg_resources').declare_namespace(__name__)

python/setup.py

@@ -42,7 +42,8 @@ setup(name='dune.codegen',
                 'dune.codegen.ufl',
                 'dune.codegen.ufl.transformations',
                 ],
-      install_requires=['sympy',
+      install_requires=['dune-common',
+                        'sympy',
                         'frozendict',
                         'pytest',
                         'pytest-flake8',