Commit 09603e8b authored by Lukas Riedel's avatar Lukas Riedel

removed dune-python dependency, now implementing the same functionality from dune-common #27

parent a04e9566
function(scrape_parameters SOURCE_DIR XML_FILE CSS OUTPUT RESULT_NAME)
message(STATUS "Running parameter scraper on sources ${SOURCE_DIR}")
if(DEPLOY_SPHINX_SOURCE_URL)
execute_process(COMMAND ${CMAKE_BINARY_DIR}/dune-env scrape_folder.py --source ${SOURCE_DIR}
execute_process(COMMAND ${CMAKE_BINARY_DIR}/run-in-dune-env scrape_folder.py --source ${SOURCE_DIR}
--xml ${XML_FILE} --out ${OUTPUT} --css ${CSS}
--source_url ${DEPLOY_SPHINX_SOURCE_URL}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
RESULT_VARIABLE RETURN_CODE)
else()
execute_process(COMMAND ${CMAKE_BINARY_DIR}/dune-env scrape_folder.py --source ${SOURCE_DIR}
execute_process(COMMAND ${CMAKE_BINARY_DIR}/run-in-dune-env scrape_folder.py --source ${SOURCE_DIR}
--xml ${XML_FILE} --out ${OUTPUT} --css ${CSS}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
RESULT_VARIABLE RETURN_CODE)
......@@ -18,11 +18,11 @@ endfunction()
file(COPY ${CMAKE_CURRENT_LIST_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/..)
scrape_parameters(${PROJECT_SOURCE_DIR}/dune/dorie-rfg ${CMAKE_CURRENT_SOURCE_DIR}/field-parameters.xml ${CMAKE_CURRENT_SOURCE_DIR}/parameters.css "parfield.ini;field-parameters.html;field-parameters.rst" FIELDPARSCRAPE_RETURN)
if (${FIELDPARSCRAPE_RETURN} GREATER 0)
if (NOT ${FIELDPARSCRAPE_RETURN} EQUAL 0)
message(FATAL_ERROR "Parameter scraper failed. DORiE can not be built.")
endif()
scrape_parameters(${PROJECT_SOURCE_DIR}/dune/dorie ${CMAKE_CURRENT_SOURCE_DIR}/parameters.xml ${CMAKE_CURRENT_SOURCE_DIR}/parameters.css "config.ini;parameters.html;parameters.rst" PARSCRAPE_RETURN)
if (${PARSCRAPE_RETURN} GREATER 0)
if (NOT ${PARSCRAPE_RETURN} EQUAL 0)
message(FATAL_ERROR "Parameter scraper failed. DORiE can not be built.")
endif()
......@@ -7,5 +7,5 @@ Module: dorie
Version: 0.9
Maintainer: dorieteam@iup.uni-heidelberg.de
#depending on
Depends: dune-python dune-pdelab
Suggests: dune-testtools dune-uggrid
Depends: dune-pdelab
Suggests: dune-testtools dune-uggrid
\ No newline at end of file
function(install_python_package curdir packagelist)
message(STATUS "Installing python package dorie.${curdir}")
dune_install_python_package(PATH ${curdir} ADDITIONAL_PIP_PARAMS -r ${CMAKE_CURRENT_SOURCE_DIR}/${curdir}/requirements.txt -q)
set(${packagelist} ${${packagelist}} ${CMAKE_CURRENT_SOURCE_DIR}/${curdir} PARENT_SCOPE)
endfunction()
set(python_paths "")
install_python_package("utilities" python_paths)
install_python_package("parscraper" python_paths)
# install required python modules
dune_python_install_package(PATH utilities)
dune_python_install_package(PATH parscraper)
add_subdirectory(parfield/wrapper)
install_python_package("parfield" python_paths)
dune_python_install_package(PATH parfield)
# install testing module
if(dune-testtools_FOUND)
add_subdirectory(testtools/wrapper)
install_python_package("testtools" python_paths)
add_subdirectory(testtools/wrapper)
dune_python_install_package(PATH testtools)
endif()
set(DORIE_PYTHON_MODULES ${python_paths} CACHE PATH "Paths to the python modules")
......@@ -13,7 +13,12 @@ setup(name='dorie.parfield',
author='Dion Häfner <mail@dionhaefner.de>',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
install_requires=['dorie.utilities'],
packages=['dorie.parfield'],
install_requires=['dorie.utilities',
'h5py',
'Pillow',
'configparser'],
packages = ['dorie.parfield',
'dorie.parfield.converter',
'dorie.parfield.parameterization'],
scripts=randomfield_scripts()
)
cycler
matplotlib
numpy
pyparsing
python-dateutil
pytz
scipy
six
wheel
......@@ -13,6 +13,19 @@ setup(name='dorie.parscraper',
author='Dion Häfner <mail@dionhaefner.de>',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
packages=['dorie.parscraper'],
packages= ['dorie.parscraper',
'dorie.parscraper.wrapper',
'dorie.parscraper.writers',
'dorie.parscraper.readers'],
install_requires= ['cycler',
'matplotlib',
'numpy',
'pyparsing',
'python-dateutil',
'pytz',
'scipy',
'six',
'wheel'
],
scripts=dorie_parscraper_scripts()
)
cycler
matplotlib
numpy
pyparsing
python-dateutil
pytz
scipy
six
wheel
......@@ -14,6 +14,22 @@ setup(name='dorie.testtools',
author='Dion Häfner <mail@dionhaefner.de>',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
packages=['dorie.testtools'],
install_requires=['dune.testtools'],
packages=['dorie.testtools',
'dorie.testtools.dorie_create',
'dorie.testtools.dorie_pfg',
'dorie.testtools.dorie_plot',
'dorie.testtools.dorie_run',
'dorie.testtools.utilities',
'dorie.testtools.wrapper'
],
install_requires=['dune.testtools',
'cycler',
'matplotlib',
'numpy',
'pyparsing',
'python-dateutil',
'pytz',
'scipy',
'six',
'wheel'],
scripts=dorie_testtools_scripts())
cycler
matplotlib
numpy
pyparsing
python-dateutil
pytz
scipy
six
wheel
......@@ -14,6 +14,16 @@ setup(name='dorie.utilities',
author='Dion Häfner <mail@dionhaefner.de>',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
packages=['dorie.utilities'],
packages=['dorie.utilities',
'dorie.utilities.vtktools'],
install_requires=['cycler',
'matplotlib',
'numpy',
'pyparsing',
'python-dateutil',
'pytz',
'scipy',
'six',
'wheel'],
scripts=dorie_utilities_scripts()
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment