Skip to content
Snippets Groups Projects
Commit 6e5922b9 authored by Thomas Jürges's avatar Thomas Jürges
Browse files

SW-626: Changed specifications of Python2.x to Python3.4

parent 4cf559e9
No related branches found
No related tags found
No related merge requests found
......@@ -20,6 +20,6 @@ multiengine_furl = %(runtime_directory)s/multiengine.furl
[deploy]
script_path = /opt/pipeline/framework/bin
controller_ppath = /opt/pipeline/dependencies/lib/python2.5/site-packages:/opt/pipeline/framework/lib/python2.5/site-packages
engine_ppath = /opt/pipeline/dependencies/lib/python2.5/site-packages/:/opt/pipeline/framework/lib/python2.5/site-packages:/opt/LofIm/daily/pyrap/lib:/opt/LofIm/daily/lofar/lib/python2.5/site-packages:/opt/pythonlibs/lib/python/site-packages
controller_ppath = /opt/pipeline/dependencies/lib/python3.4/site-packages:/opt/pipeline/framework/lib/python3.4/site-packages
engine_ppath = /opt/pipeline/dependencies/lib/python3.4/site-packages/:/opt/pipeline/framework/lib/python3.4/site-packages:/opt/LofIm/daily/pyrap/lib:/opt/LofIm/daily/lofar/lib/python3.4/site-packages:/opt/pythonlibs/lib/python/site-packages
engine_lpath = /opt/pipeline/dependencies/lib:/opt/LofIm/daily/pyrap/lib:/opt/LofIm/daily/casacore/lib:/opt/LofIm/daily/lofar/lib:/opt/wcslib/lib/:/opt/hdf5/lib
......@@ -13,8 +13,8 @@ multiengine_furl = %(runtime_directory)s/multiengine.furl
[deploy]
script_path = /opt/pipeline/framework/bin
controller_ppath = /opt/pipeline/dependencies/lib/python2.5/site-packages:/opt/pipeline/framework/lib/python2.5/site-packages
engine_ppath = /opt/pipeline/dependencies/lib/python2.5/site-packages/:/opt/pipeline/framework/lib/python2.5/site-packages:/opt/LofIm/daily/pyrap/lib:/opt/LofIm/daily/lofar/lib/python2.5/site-packages:/opt/pythonlibs/lib/python/site-packages
controller_ppath = /opt/pipeline/dependencies/lib/python3.4/site-packages:/opt/pipeline/framework/lib/python3.4/site-packages
engine_ppath = /opt/pipeline/dependencies/lib/python3.4/site-packages/:/opt/pipeline/framework/lib/python3.4/site-packages:/opt/LofIm/daily/pyrap/lib:/opt/LofIm/daily/lofar/lib/python3.4/site-packages:/opt/pythonlibs/lib/python/site-packages
engine_lpath = /opt/pipeline/dependencies/lib:/opt/LofIm/daily/pyrap/lib:/opt/LofIm/daily/casacore/lib:/opt/LofIm/daily/lofar/lib:/opt/wcslib/lib/:/opt/hdf5/lib
[logging]
......
......@@ -6,7 +6,7 @@ casaroot = /opt/casacore
pyraproot = /opt/python-casacore/pyrap
hdf5root =
wcsroot = /opt/wcslib
pythonpath = /opt/lofar/lib/python2.7/site-packages
pythonpath = /opt/lofar/lib/python3.4/site-packages
# runtime dir is a global FS (nfs, lustre) to exchange small files (parsets, vds, map files, etc)
runtime_directory = /data/share/pipeline
recipe_directories = [%(pythonpath)s/lofarpipe/recipes]
......
......@@ -14,7 +14,7 @@ option(USE_CUDA "Use CUDA" ON)
set(QPID_ROOT_DIR /opt/qpid)
# This is a Python runtime dependency and thus shouldn't be needed here. But let's fix the build for the mo.
set(BDSF_ROOT_DIR /usr/local/lib/python2.7/dist-packages)
set(BDSF_ROOT_DIR /usr/local/lib/python3.4/dist-packages)
# Enable ccache symlinks to accelerate recompilation (/usr/bin/ccache).
#set(GNU_C /usr/lib64/ccache/gcc)
......
# Fix for Debian (FindPython tends to settle on /usr/bin/python2.6, which is a "minimal" python install)
set(PYTHON_EXECUTABLE "/usr/bin/python2.7")
set(PYTHON_EXECUTABLE "/usr/bin/python3")
......@@ -7,7 +7,7 @@ set(CASACORE_ROOT_DIR "/opt/casacore")
set(CASAREST_ROOT_DIR "/opt/casarest")
set(PYRAP_ROOT_DIR "/opt/pyrap")
set(AOFLAGGER_ROOT_DIR "/opt/aoflagger/build")
set(BDSF_ROOT_DIR "/opt/PyBDSF/lib64/python2.7/site-packages/")
set(BDSF_ROOT_DIR "/opt/PyBDSF/lib64/python3.4/site-packages/")
set(DAL_ROOT_DIR "/opt/DAL")
#set(QPID_ROOT_DIR /opt/qpid)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment