Commit a87e4624 authored by Lukas Riedel's avatar Lukas Riedel

Merge branch 'feature/squash-testing-pipeline' into feature/dune-randomfield

parents 3a801ca3 da3396cd
......@@ -8,47 +8,89 @@ before_script:
stages:
- build
- test
- deploy
build:main:
stage: build
tags:
- docker
- demeter
script:
- CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --only=dorie all
- export PATH=/opt/dune/dorie/build-cmake/bin:$PATH
- ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
- ./dune-common/bin/dunecontrol --only=dorie make doc
stage: build
artifacts:
name: "$CI_BUILD_NAME"
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/doc/html/
expire_in: 1 week
- $CI_PROJECT_DIR/build-cmake
expire_in: 3 days
build:update_dune:
stage: build
tags:
- docker
- demeter
only:
- master
script:
- ./dune-common/bin/dunecontrol update || true
- ./dune-common/bin/dunecontrol update
- ./dune-common/bin/dunecontrol exec "rm -rf build-cmake"
- CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol all
- export PATH=/opt/dune/dorie/build-cmake/bin:$PATH
- ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
stage: build
- CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --module=dorie all
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake
expire_in: 3 days
build:debug:
stage: build
tags:
- docker
- demeter
script:
- CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" ./dune-common/bin/dunecontrol --only=dorie all
stage: build
- CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --only=dorie all
deploy:docs:
test:main:
stage: test
tags:
- docker
- demeter
dependencies:
- build:main
allow_failure: true
script:
- cd $CI_PROJECT_DIR && bash .deploy_docs
stage: deploy
- ./dune-common/bin/dunecontrol --only=dorie configure
- ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/Testing
expire_in: 1 week
test:update_dune:
stage: test
tags:
- demeter
dependencies:
- build:update_dune
only:
- master
allow_failure: true
script:
- ./dune-common/bin/dunecontrol --only=dorie configure
- ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/Testing
expire_in: 1 week
deploy:build_docs:
stage: deploy
tags:
- demeter
dependencies:
- build:main
script:
- ./dune-common/bin/dunecontrol --only=dorie configure
- ./dune-common/bin/dunecontrol --only=dorie make doc
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/doc
expire_in: 1 week
\ No newline at end of file
function(dorie_python_install_package directory)
dune_python_install_package(PATH ${directory}
ADDITIONAL_PIP_PARAMS --force-reinstall --upgrade --no-deps
-r ${CMAKE_CURRENT_SOURCE_DIR}/${directory}/requirements.txt)
endfunction()
# install the following modules in editable mode: 'pip -e'
set(DUNE_PYTHON_INSTALL_EDITABLE TRUE)
# install required python modules
dorie_python_install_package(utilities)
dorie_python_install_package(parscraper)
dune_python_install_package(PATH utilities)
dune_python_install_package(PATH parscraper)
add_subdirectory(parfield/wrapper)
dorie_python_install_package(parfield)
dune_python_install_package(PATH parfield)
# install testing module
if(dune-testtools_FOUND)
add_subdirectory(testtools/wrapper)
dorie_python_install_package(testtools)
dune_python_install_package(PATH testtools)
endif()
set(DORIE_PYTHON_MODULES ${python_paths} CACHE PATH "Paths to the python modules")
h5py
Pillow
configparser
\ No newline at end of file
......@@ -13,7 +13,10 @@ setup(name='dorie.parfield',
author='Dion Häfner <mail@dionhaefner.de>',
author_email='dorieteam@iup.uni-heidelberg.de',
url='',
install_requires=['dorie.utilities'],
install_requires=['dorie.utilities',
'h5py',
'Pillow',
'configparser'],
packages = ['dorie.parfield',
'dorie.parfield.converter',
'dorie.parfield.parameterization'],
......
cycler
matplotlib
numpy
pyparsing
python-dateutil
pytz
scipy
six
wheel
\ No newline at end of file
......@@ -17,5 +17,15 @@ setup(name='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
\ No newline at end of file
......@@ -22,5 +22,14 @@ setup(name='dorie.testtools',
'dorie.testtools.utilities',
'dorie.testtools.wrapper'
],
install_requires=['dune.testtools'],
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
\ No newline at end of file
......@@ -16,5 +16,14 @@ setup(name='dorie.utilities',
url='',
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