From 6e5922b9ebe572492f9de7a19d1ef0f17f9fb36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl> Date: Tue, 2 Apr 2019 15:24:38 +0000 Subject: [PATCH] SW-626: Changed specifications of Python2.x to Python3.4 --- .../docs/examples/definition/dummy_parallel/pipeline.cfg | 4 ++-- CEP/Pipeline/docs/examples/definition/sip2/pipeline.cfg | 4 ++-- CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.tmpl | 2 +- CMake/variants/variants.dop256 | 2 +- CMake/variants/variants.dop320 | 3 +-- CMake/variants/variants.lcs157 | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CEP/Pipeline/docs/examples/definition/dummy_parallel/pipeline.cfg b/CEP/Pipeline/docs/examples/definition/dummy_parallel/pipeline.cfg index a788b895737..53f8f116f94 100644 --- a/CEP/Pipeline/docs/examples/definition/dummy_parallel/pipeline.cfg +++ b/CEP/Pipeline/docs/examples/definition/dummy_parallel/pipeline.cfg @@ -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 diff --git a/CEP/Pipeline/docs/examples/definition/sip2/pipeline.cfg b/CEP/Pipeline/docs/examples/definition/sip2/pipeline.cfg index 2abb670c25b..1231abf4e0a 100644 --- a/CEP/Pipeline/docs/examples/definition/sip2/pipeline.cfg +++ b/CEP/Pipeline/docs/examples/definition/sip2/pipeline.cfg @@ -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] diff --git a/CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.tmpl b/CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.tmpl index 27b04cf6f7a..bca2626b704 100644 --- a/CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.tmpl +++ b/CEP/Pipeline/recipes/sip/pipeline.cfg.CEP4.tmpl @@ -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] diff --git a/CMake/variants/variants.dop256 b/CMake/variants/variants.dop256 index 25eca45b00d..116d2f2ba8c 100644 --- a/CMake/variants/variants.dop256 +++ b/CMake/variants/variants.dop256 @@ -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) diff --git a/CMake/variants/variants.dop320 b/CMake/variants/variants.dop320 index e11707efd90..e31c3660039 100644 --- a/CMake/variants/variants.dop320 +++ b/CMake/variants/variants.dop320 @@ -1,2 +1 @@ -# 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") diff --git a/CMake/variants/variants.lcs157 b/CMake/variants/variants.lcs157 index 148f76b8073..24132ce3a28 100644 --- a/CMake/variants/variants.lcs157 +++ b/CMake/variants/variants.lcs157 @@ -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) -- GitLab