Commit 0b5751d9 authored by Martin Reinecke's avatar Martin Reinecke

Merge branch 'NIFTy_4' into new_los

parents a0d4bb5b 40746352
Pipeline #28580 passed with stages
in 3 minutes and 8 seconds
......@@ -2,6 +2,7 @@ image: $CONTAINER_TEST_IMAGE
variables:
CONTAINER_TEST_IMAGE: gitlab-registry.mpcdf.mpg.de/ift/nifty:$CI_BUILD_REF_NAME
OMP_NUM_THREADS: 1
stages:
- build_docker
......@@ -46,13 +47,13 @@ test_python2_mpi:
stage: test
script:
- python setup.py install --user -f
- OMP_NUM_THREADS=1 mpiexec -n 2 nosetests -q 2> /dev/null
- mpiexec -n 2 --bind-to none nosetests -q 2> /dev/null
test_python3_mpi:
stage: test
script:
- python3 setup.py install --user -f
- OMP_NUM_THREADS=1 mpiexec -n 2 nosetests3 -q 2> /dev/null
- mpiexec -n 2 --bind-to none nosetests3 -q 2> /dev/null
pages:
stage: release
......
......@@ -3,7 +3,7 @@
# 2) we can import it in setup.py for the same reason
# 3) we can import it into your module module
__version__ = '4.1.0'
__version__ = '4.2.0'
def gitversion():
......
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