Fix Jenkins Doc generation (#3572)

* fix doc CI * update py3 * update pip3 Co-authored-by: Huijun Wu <[email protected]>
apache · Jul 18, 2020 · fd0ec5f · fd0ec5f
1 parent 14bc58b
commit fd0ec5f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/website2/website/scripts/Dockerfile.ubuntu18.04 b/website2/website/scripts/Dockerfile.ubuntu18.04
@@ -23,28 +23,29 @@ ENV bazelVersion 3.0.0
 
 
 RUN apt-get update && apt-get -y install \
-      g++ \
-      cmake \
+      ant \
       automake \
+      cmake \
+      curl \
+      curl \
+      g++ \
+      git \
+      libcppunit-dev \
       libtool-bin \
       libunwind8 \
-      patch \
-      python-dev \
-      wget \
-      zip \
-      virtualenv \
-      unzip \
-      git \
-      curl \
       openjdk-11-jdk-headless \
+      patch \
+      python3 \
+      python3-dev \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel \
+      sudo \
       tree \
-      python-setuptools \
-      python-dev \
-      python-wheel \
-      python \
-      python-pip \
-      curl \
-      sudo
+      unzip \
+      virtualenv \
+      wget \
+      zip
 
 RUN curl -sL https://deb.nodesource.com/setup_13.x | sudo -E bash -
 

diff --git a/website2/website/scripts/python-doc-gen.sh b/website2/website/scripts/python-doc-gen.sh
@@ -38,12 +38,12 @@ PIP_LOCATION=${HERON_ROOT_DIR}/bazel-bin/scripts/packages
 
 virtualenv "$VENV"
 source "$VENV/bin/activate"
-pip install pdoc==0.3.2
-pip install --ignore-installed six
+pip3 install pdoc==0.3.2
+pip3 install --ignore-installed six
 # Install the heronpy
 echo "list heronpy location"
 ls $PIP_LOCATION
-pip install $PIP_LOCATION/heronpy-*-py2.py3-none-any.whl
+pip3 install $PIP_LOCATION/heronpy-*-py3-none-any.whl
 
 
 mkdir -p static/api && rm -rf static/api/python