Merge pull request #798 from barrierye/fixed-wheel-version

Fixed wheel version

doc/COMPILE.md

@@ -23,7 +23,7 @@
 |           libXext            |                            1.3.3                             |
 |            libSM             |                            1.2.2                             |
 |          libXrender          |                            0.9.10                            |
-|          python-whl          | numpy>=1.12, <=1.16.4<br/>google>=2.0.3<br/>protobuf>=3.12.2<br/>grpcio-tools>=1.28.1<br/>grpcio>=1.28.1<br/>func-timeout>=4.3.5<br/>pyyaml>=1.3.0<br/>sentencepiece==0.1.92<br>flask>=1.1.2<br>ujson>=2.0.3 |
+|          python-whl          | numpy>=1.12, <=1.16.4<br/>wheel>=0.34.0, <0.35.0<br/>setuptools>=44.1.0<br/>opencv-python==4.2.0.32<br/>google>=2.0.3<br/>protobuf>=3.12.2<br/>grpcio-tools>=1.28.1<br/>grpcio>=1.28.1<br/>func-timeout>=4.3.5<br/>pyyaml>=1.3.0<br/>sentencepiece==0.1.92<br>flask>=1.1.2<br>ujson>=2.0.3 |
 
 It is recommended to use Docker for compilation. We have prepared the Paddle Serving compilation environment for you, see [this document](DOCKER_IMAGES.md).
 

doc/COMPILE_CN.md

@@ -23,7 +23,7 @@
 |           libXext            |                            1.3.3                             |
 |            libSM             |                            1.2.2                             |
 |          libXrender          |                            0.9.10                            |
-|          python-whl          | numpy>=1.12, <=1.16.4<br/>google>=2.0.3<br/>protobuf>=3.12.2<br/>grpcio-tools>=1.28.1<br/>grpcio>=1.28.1<br/>func-timeout>=4.3.5<br/>pyyaml>=1.3.0<br/>sentencepiece==0.1.92<br/>flask>=1.1.2<br/>ujson>=2.0.3 |
+|          python-whl          | numpy>=1.12, <=1.16.4<br/>wheel>=0.34.0, <0.35.0<br/>setuptools>=44.1.0<br/>opencv-python==4.2.0.32<br/>google>=2.0.3<br/>protobuf>=3.12.2<br/>grpcio-tools>=1.28.1<br/>grpcio>=1.28.1<br/>func-timeout>=4.3.5<br/>pyyaml>=1.3.0<br/>sentencepiece==0.1.92<br/>flask>=1.1.2<br/>ujson>=2.0.3 |
 
 推荐使用Docker编译，我们已经为您准备好了Paddle Serving编译环境，详见[该文档](DOCKER_IMAGES_CN.md)。
 

python/requirements.txt

 numpy>=1.12, <=1.16.4 ; python_version<"3.5"
+wheel>=0.34.0, <0.35.0
+setuptools>=44.1.0
 opencv-python==4.2.0.32
 google>=2.0.3
 protobuf>=3.12.2

tools/Dockerfile.centos6.cuda9.0-cudnn7.devel

@@ -31,7 +31,6 @@ RUN yum -y install wget && \
     curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
     python get-pip.py && \
     rm get-pip.py && \
-    pip install google protobuf setuptools wheel flask numpy==1.16.4 && \
     wget https://www.python.org/ftp/python/3.6.8/Python-3.6.8.tgz && \
     tar -zxf Python-3.6.8.tgz && \
     cd Python-3.6.8 && \
@@ -42,7 +41,6 @@ RUN yum -y install wget && \
     echo 'export LD_LIBRARY_PATH=/usr/local/python3.6/lib:$LD_LIBRARY_PATH' >> /root/.bashrc && \
     source /root/.bashrc && \
     cd .. && rm -rf Python-3.6.8* && \
-    pip3 install google protobuf setuptools wheel flask numpy==1.16.4 && \
     yum -y install epel-release && yum -y install patchelf libXext libSM libXrender && \
     yum clean all && \
     echo "export LANG=en_US.utf8" >> /root/.bashrc && \

tools/Dockerfile.centos6.devel

@@ -31,7 +31,6 @@ RUN yum -y install wget && \
     curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
     python get-pip.py && \
     rm get-pip.py && \
-    pip install google protobuf setuptools wheel flask numpy==1.16.4 && \
     wget https://www.python.org/ftp/python/3.6.8/Python-3.6.8.tgz && \
     tar -zxf Python-3.6.8.tgz && \
     cd Python-3.6.8 && \
@@ -42,7 +41,6 @@ RUN yum -y install wget && \
     echo 'export LD_LIBRARY_PATH=/usr/local/python3.6/lib:$LD_LIBRARY_PATH' >> /root/.bashrc && \
     source /root/.bashrc && \
     cd .. && rm -rf Python-3.6.8* && \
-    pip3 install google protobuf setuptools wheel flask numpy==1.16.4 && \
     yum -y install epel-release && yum -y install patchelf libXext libSM libXrender && \
     yum clean all && \
     localedef -c -i en_US -f UTF-8 en_US.UTF-8 && \

tools/Dockerfile.ci

@@ -23,7 +23,6 @@ RUN wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz >/dev/null \
 RUN yum -y install python-devel sqlite-devel >/dev/null \
     && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py >/dev/null \
     && python get-pip.py >/dev/null \
-    && pip install google protobuf setuptools wheel flask >/dev/null \
     && rm get-pip.py
 
 RUN wget http://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2 \
@@ -35,8 +34,7 @@ RUN wget http://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2
     && cd .. \
     && rm -rf patchelf-0.10*
 
-RUN yum install -y python3 python3-devel \
-    && pip3 install google protobuf setuptools wheel flask
+RUN yum install -y python3 python3-devel
 
 RUN yum -y update >/dev/null \
     && yum -y install dnf >/dev/null \

tools/Dockerfile.cuda10.0-cudnn7.devel

@@ -23,11 +23,9 @@ RUN wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz >/dev/null \
 RUN yum -y install python-devel sqlite-devel  \
     && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py >/dev/null \
     && python get-pip.py >/dev/null \
-    && pip install google protobuf setuptools wheel flask >/dev/null \
     && rm get-pip.py 
 
 RUN yum install -y python3 python3-devel \
-    && pip3 install google protobuf setuptools wheel flask \
     && yum -y install epel-release && yum -y install patchelf libXext libSM libXrender\
     && yum clean all 
 

tools/Dockerfile.cuda9.0-cudnn7.devel

@@ -22,11 +22,9 @@ RUN wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz >/dev/null \
 RUN yum -y install python-devel sqlite-devel  \
     && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py >/dev/null \
     && python get-pip.py >/dev/null \
-    && pip install google protobuf setuptools wheel flask >/dev/null \
     && rm get-pip.py 
 
 RUN yum install -y python3 python3-devel \
-    && pip3 install google protobuf setuptools wheel flask \
     && yum -y install epel-release && yum -y install patchelf libXext libSM libXrender\
     && yum clean all 
 

tools/Dockerfile.devel

@@ -19,11 +19,9 @@ RUN wget https://dl.google.com/go/go1.14.linux-amd64.tar.gz >/dev/null \
 RUN yum -y install python-devel sqlite-devel  \
     && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py >/dev/null \
     && python get-pip.py >/dev/null \
-    && pip install google protobuf setuptools wheel flask >/dev/null \
     && rm get-pip.py 
 
 RUN yum install -y python3 python3-devel \
-    && pip3 install google protobuf setuptools wheel flask \
     && yum -y install epel-release && yum -y install patchelf libXext libSM libXrender\
     && yum clean all