Skip to content
Snippets Groups Projects
Commit 148ed136 authored by Jörn Künsemöller's avatar Jörn Künsemöller
Browse files

Task LSMR-8: attempt to switch to Python 3

parent 31cc2138
No related branches found
No related tags found
1 merge request!87Lsmr epic
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
lofar_package(LSMR 0.1) lofar_package(LSMR 0.1)
include(PythonInstall)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(bin) add_subdirectory(bin)
add_subdirectory(test) add_subdirectory(test)
......
...@@ -39,6 +39,6 @@ done ...@@ -39,6 +39,6 @@ done
echo "Using port $PORT" echo "Using port $PORT"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
$DIR/../lib*/python*/site-packages/lofar/sas/lsmr/manage.py migrate /usr/bin/python3 $DIR/../lib*/python*/site-packages/lofar/sas/lsmr/manage.py migrate
$DIR/../lib*/python*/site-packages/lofar/sas/lsmr/manage.py runserver 0.0.0.0:$PORT /usr/bin/python3 $DIR/../lib*/python*/site-packages/lofar/sas/lsmr/manage.py runserver 0.0.0.0:$PORT
lofar_find_package(PythonInterp 3.4 REQUIRED) lofar_find_package(PythonInterp 3.4 REQUIRED)
set(USE_PYTHON_COMPILATION Off)
include(PythonInstall) include(PythonInstall)
include(FindPython3Module) include(FindPython3Module)
......
include(LofarCTest) include(LofarCTest)
include(FindPython3Module) include(FindPython3Module)
set(USE_PYTHON_COMPILATION Off)
find_python3_module(mock REQUIRED) find_python3_module(mock REQUIRED)
find_python3_module(requests REQUIRED) # FIXME: Not detected find_python3_module(requests REQUIRED)
lofar_add_test(t_lsmrapp_models) lofar_add_test(t_lsmrapp_models)
lofar_add_test(t_functional) lofar_add_test(t_functional)
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