From 70d0e24cc218bd05e79ac33e45ea5687a8282993 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 15 Dec 2020 15:13:34 +0100
Subject: [PATCH] build python docs
---
consumer/api/python/dist_linux/CMakeLists.txt | 8 ++++----
deploy/build_env/debians/Dockerfile_ubuntu16.04 | 2 +-
deploy/build_env/debians/build.sh | 10 +++++++++-
producer/api/python/dist_linux/CMakeLists.txt | 8 ++++----
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/consumer/api/python/dist_linux/CMakeLists.txt b/consumer/api/python/dist_linux/CMakeLists.txt
index a5290d802..b55ffc3f6 100644
--- a/consumer/api/python/dist_linux/CMakeLists.txt
+++ b/consumer/api/python/dist_linux/CMakeLists.txt
@@ -12,13 +12,13 @@ if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
ADD_CUSTOM_TARGET(python-rpm-consumer ALL
COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
--requires=numpy --binary-only
- COMMAND rm dist/python*.gz dist/*debuginfo*
+ COMMAND rm -f dist/python*.gz dist/*debuginfo*
)
ADD_CUSTOM_TARGET(python3-rpm-consumer ALL
COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
--requires=python3-numpy --binary-only
- COMMAND rm dist/python3*.gz dist/*debuginfo*
+ COMMAND rm -f dist/python3*.gz dist/*debuginfo*
)
ADD_DEPENDENCIES(python3-rpm-consumer copy_python_dist-consumer)
ADD_DEPENDENCIES(python-rpm-consumer copy_python_dist-consumer)
@@ -29,7 +29,7 @@ if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
COMMAND rm -rf deb_dist/*/
COMMAND PACKAGE_PREFIX= python setup.py --command-packages=stdeb.command
sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends=python-numpy bdist_deb
- COMMAND rm deb_dist/*dbgsym*
+ COMMAND rm -f deb_dist/*dbgsym*
COMMAND cp deb_dist/*.deb dist/
)
@@ -37,7 +37,7 @@ if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
COMMAND rm -rf deb_dist/*/
COMMAND PACKAGE_PREFIX= python3 setup.py --command-packages=stdeb.command
sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends3=python3-numpy bdist_deb
- COMMAND rm deb_dist/*dbgsym*
+ COMMAND rm -f deb_dist/*dbgsym*
COMMAND cp deb_dist/*.deb dist/
)
ADD_DEPENDENCIES(python3-deb-consumer copy_python_dist-consumer)
diff --git a/deploy/build_env/debians/Dockerfile_ubuntu16.04 b/deploy/build_env/debians/Dockerfile_ubuntu16.04
index 9b672c32f..1a79c19bb 100644
--- a/deploy/build_env/debians/Dockerfile_ubuntu16.04
+++ b/deploy/build_env/debians/Dockerfile_ubuntu16.04
@@ -8,7 +8,7 @@ ADD install_cmake.sh install_cmake.sh
RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
-RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython
+RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython sphinx
RUN ./install_curl.sh /curl && ./install_cmake.sh
diff --git a/deploy/build_env/debians/build.sh b/deploy/build_env/debians/build.sh
index 5037380f7..db52c3c74 100755
--- a/deploy/build_env/debians/build.sh
+++ b/deploy/build_env/debians/build.sh
@@ -18,5 +18,13 @@ cmake .. #second time for to correctly build deb packages
make
make package
-cmake -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DBUILD_PYTHON_PACKAGES="source;deb" ..
+
+if [ "$OS" = "ubuntu16.04" ]; then
+ BUILD_PYTHON_DOCS=ON
+else
+ BUILD_PYTHON_DOCS=OFF
+fi
+
+
+cmake -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DBUILD_PYTHON_PACKAGES="source;deb" -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS ..
make
diff --git a/producer/api/python/dist_linux/CMakeLists.txt b/producer/api/python/dist_linux/CMakeLists.txt
index a76ce7c22..023935516 100644
--- a/producer/api/python/dist_linux/CMakeLists.txt
+++ b/producer/api/python/dist_linux/CMakeLists.txt
@@ -7,13 +7,13 @@ if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
ADD_CUSTOM_TARGET(python-rpm-producer ALL
COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
--requires=numpy --binary-only
- COMMAND rm dist/python*.gz dist/*debuginfo*
+ COMMAND rm -f dist/python*.gz dist/*debuginfo*
)
ADD_CUSTOM_TARGET(python3-rpm-producer ALL
COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
--requires=python3-numpy --binary-only
- COMMAND rm dist/python3*.gz dist/*debuginfo*
+ COMMAND rm -f dist/python3*.gz dist/*debuginfo*
)
ADD_DEPENDENCIES(python3-rpm-producer copy_python_dist-producer)
ADD_DEPENDENCIES(python-rpm-producer copy_python_dist-producer)
@@ -24,7 +24,7 @@ if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
COMMAND rm -rf deb_dist/*/
COMMAND PACKAGE_PREFIX= python setup.py --command-packages=stdeb.command
sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends=python-numpy bdist_deb
- COMMAND rm deb_dist/*dbgsym*
+ COMMAND rm -f deb_dist/*dbgsym*
COMMAND cp deb_dist/*.deb dist/
)
@@ -32,7 +32,7 @@ if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
COMMAND rm -rf deb_dist/*/
COMMAND PACKAGE_PREFIX= python3 setup.py --command-packages=stdeb.command
sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends3=python3-numpy bdist_deb
- COMMAND rm deb_dist/*dbgsym*
+ COMMAND rm -f deb_dist/*dbgsym*
COMMAND cp deb_dist/*.deb dist/
)
ADD_DEPENDENCIES(python3-deb-producer copy_python_dist-producer)
--
GitLab