Merge branch 'feature/adapt-to-dune-python-refactoring' into 'master'

Update to comply with refactoring of dune-python

Only merge once the upstream branch is merged.

See merge request !26

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}

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

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 = {