From 80f110329a8d8b2aa20009c48a290352507b4bfb Mon Sep 17 00:00:00 2001
From: barriery <barriery@qq.com>
Date: Thu, 20 Aug 2020 05:52:18 +0000
Subject: [PATCH] fix ci script

---
 doc/COMPILE.md                | 1 +
 doc/COMPILE_CN.md             | 1 +
 python/setup.py.client.in     | 1 -
 python/setup.py.server.in     | 1 -
 python/setup.py.server_gpu.in | 1 -
 python/util.py                | 1 +
 tools/serving_build.sh        | 1 +
 7 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/COMPILE.md b/doc/COMPILE.md
index c619e012..6f7e7bba 100644
--- a/doc/COMPILE.md
+++ b/doc/COMPILE.md
@@ -76,6 +76,7 @@ export PATH=$PATH:$GOPATH/bin
 go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
 go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
 go get -u github.com/golang/protobuf/protoc-gen-go
+go get -u golang.org/x/net/context
 ```
 
 ## Compile Server
diff --git a/doc/COMPILE_CN.md b/doc/COMPILE_CN.md
index 9da21334..a8e2a632 100644
--- a/doc/COMPILE_CN.md
+++ b/doc/COMPILE_CN.md
@@ -76,6 +76,7 @@ export PATH=$PATH:$GOPATH/bin
 go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
 go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
 go get -u github.com/golang/protobuf/protoc-gen-go
+go get -u golang.org/x/net/context
 ```
 
 
diff --git a/python/setup.py.client.in b/python/setup.py.client.in
index c1f143f0..2675e2b3 100644
--- a/python/setup.py.client.in
+++ b/python/setup.py.client.in
@@ -23,7 +23,6 @@ from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
 from paddle_serving_client.version import serving_client_version
-from pkg_resources import DistributionNotFound, get_distribution
 import util
 
 py_version = sys.version_info
diff --git a/python/setup.py.server.in b/python/setup.py.server.in
index 38324309..60530311 100644
--- a/python/setup.py.server.in
+++ b/python/setup.py.server.in
@@ -20,7 +20,6 @@ from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
 from paddle_serving_server.version import serving_server_version
-from pkg_resources import DistributionNotFound, get_distribution
 import util
 
 max_version, mid_version, min_version = util.python_version()
diff --git a/python/setup.py.server_gpu.in b/python/setup.py.server_gpu.in
index 277cae6a..523615b8 100644
--- a/python/setup.py.server_gpu.in
+++ b/python/setup.py.server_gpu.in
@@ -20,7 +20,6 @@ from setuptools import setup, Distribution, Extension
 from setuptools import find_packages
 from setuptools import setup
 from paddle_serving_server_gpu.version import serving_server_version
-from pkg_resources import DistributionNotFound, get_distribution
 import util
 
 max_version, mid_version, min_version = util.python_version()
diff --git a/python/util.py b/python/util.py
index c3547c18..0ae68c1e 100644
--- a/python/util.py
+++ b/python/util.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from pkg_resources import DistributionNotFound, get_distribution
 from grpc_tools import protoc
 import os
 import platform
diff --git a/tools/serving_build.sh b/tools/serving_build.sh
index 1078b004..c105927e 100644
--- a/tools/serving_build.sh
+++ b/tools/serving_build.sh
@@ -25,6 +25,7 @@ function init() {
     go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
     go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
     go get -u github.com/golang/protobuf/protoc-gen-go
+    go get -u golang.org/x/net/context
 }
 
 function check_cmd() {
-- 
GitLab