diff --git a/deploy/docker_buildenv/Ubuntu16.04/Dockerfile b/deploy/docker_buildenv/Ubuntu16.04/Dockerfile index 7cdc53109b0248001fdfdd72dc7857fef7ba1954..45fe5432d1ac7b1a3ad4a0df0dee6a2010ccbd92 100644 --- a/deploy/docker_buildenv/Ubuntu16.04/Dockerfile +++ b/deploy/docker_buildenv/Ubuntu16.04/Dockerfile @@ -9,4 +9,7 @@ ADD install_curl.sh install_curl.sh RUN ./install_curl.sh /curl RUN apt install -y python-pip python3-pip && pip install --upgrade cython && pip3 install --upgrade cython +RUN pip3 install sphinx + ADD build.sh /bin/build.sh + diff --git a/deploy/docker_buildenv/Ubuntu16.04/build.sh b/deploy/docker_buildenv/Ubuntu16.04/build.sh index 48e7d972c0f0c7af47d1f4977f8e767f5ccdbeb4..edebc5038a65d919b7dbb10f9db3973c97d12c8f 100755 --- a/deploy/docker_buildenv/Ubuntu16.04/build.sh +++ b/deploy/docker_buildenv/Ubuntu16.04/build.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash cd /asapo/build -cmake -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl .. +cmake -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl -DBUILD_PYTHON_DOCS=ON .. cd worker && make cd ../producer && make +cd ../sphinx && make diff --git a/sphinx/source/conf.py b/sphinx/source/conf.py index 8964c048c0b7532e8a346e6b94eaa8793bfe31e3..7bcf43111ca77b773438b90d1857a8826c1660dc 100644 --- a/sphinx/source/conf.py +++ b/sphinx/source/conf.py @@ -19,8 +19,8 @@ import os import sys -sys.path.insert(0, '/home/yakubov/projects/asapo/cmake-build-debug/worker/api/python') -sys.path.insert(0, '/home/yakubov/projects/asapo/cmake-build-debug/producer/api/python') +sys.path.insert(0, os.path.abspath('../../../worker/api/python')) +sys.path.insert(0, os.path.abspath('../../../producer/api/python')) import asapo_producer diff --git a/worker/api/python/CMakeLists_Linux.cmake b/worker/api/python/CMakeLists_Linux.cmake index ffe11d7ae277da561c4f578f256536b680a46167..9c2d447fc2b6fdc6e82d6937427b1eeed4daf164 100644 --- a/worker/api/python/CMakeLists_Linux.cmake +++ b/worker/api/python/CMakeLists_Linux.cmake @@ -16,10 +16,10 @@ set (ASAPO_WORKER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/include) configure_files(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @ONLY) ADD_CUSTOM_TARGET(python-lib2 ALL - COMMAND python setup.py build_ext --inplace) + COMMAND python setup.py build_ext --inplace --force) ADD_CUSTOM_TARGET(python-lib3 ALL - COMMAND python3 setup.py build_ext --inplace) + COMMAND python3 setup.py build_ext --inplace --force) ADD_DEPENDENCIES(python-lib2 asapo-worker) ADD_DEPENDENCIES(python-lib3 asapo-worker)