From 3800216900a5430e5a04f3ed2c87c9c871545cf2 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Tue, 20 Sep 2016 15:38:33 +0200
Subject: [PATCH] Update to comply with refactoring of dune-python
---
cmake/modules/DunePerftoolMacros.cmake | 2 +-
python/CMakeLists.txt | 15 ++++++---------
python/setup.py | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/cmake/modules/DunePerftoolMacros.cmake b/cmake/modules/DunePerftoolMacros.cmake
index cf528aeb..9a08aad7 100644
--- a/cmake/modules/DunePerftoolMacros.cmake
+++ b/cmake/modules/DunePerftoolMacros.cmake
@@ -102,7 +102,7 @@ function(add_generated_executable)
configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/StandardMain.cmake ${GEN_MAIN})
add_custom_command(OUTPUT ${GEN_OPERATOR} ${GEN_DRIVER}
- COMMAND ${CMAKE_BINARY_DIR}/dune-env-2 ufl2pdelab
+ COMMAND ${CMAKE_BINARY_DIR}/dune-env ufl2pdelab
--project-basedir ${CMAKE_BINARY_DIR}
--operator-file ${GEN_OPERATOR}
--driver-file ${GEN_DRIVER}
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 37b9ba86..0ac8b666 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -10,16 +10,13 @@ create_virtualenv_wrapper(ENVPATH ${dune-python_DIR}/python2-env
NAME notebook)
# Install all the external packages that we have as submodules
+dune_install_python_package(PATH pymbolic)
+dune_install_python_package(PATH cgen)
+dune_install_python_package(PATH loopy)
+dune_install_python_package(PATH ufl)
-dune_install_python_package(PATH pymbolic MAJOR_VERSION 2)
-# islpy has some serious bug: it cannot be installed with pip
-dune_install_python_package(PATH cgen MAJOR_VERSION 2)
-# --no-deps to avoid reinstallation of islpy through pip...argh!
-dune_install_python_package(PATH loopy MAJOR_VERSION 2 ADDITIONAL_PIP_PARAMS --no-deps)
-dune_install_python_package(PATH ufl MAJOR_VERSION 2)
-
-# Install out python package
-dune_install_python_package(PATH . MAJOR_VERSION 2)
+# Install our python package
+dune_install_python_package(PATH .)
add_python_test_command(COMMAND python -m pytest --pep8 VIRTUALENV dune-env-2
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python/dune/perftool
diff --git a/python/setup.py b/python/setup.py
index 2ef4dc99..6d7a069d 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -30,7 +30,7 @@ setup(name='dune.perftool',
author='Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>',
url='http://conan2.iwr.uni-heidelberg.de/git/dominic/dune-perftool',
packages=['dune.perftool'],
- install_requires=['sympy'],
+ install_requires=['dune.testtools', 'sympy'],
tests_require=['pytest'],
cmdclass={'test': PyTest},
entry_points = {
--
GitLab