Merge branch 'develop' into develop

1f4885dd · TeslaZhao · GitHub · fc35715f · 87af40e9 · 1f4885dd
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

python/setup.py.client.in python/setup.py.client.in +2 -2

python/setup.py.server.in python/setup.py.server.in +1 -1

python/setup.py.server_gpu.in python/setup.py.server_gpu.in +1 -1

未找到文件。
--- a/python/setup.py.client.in
+++ b/python/setup.py.client.in
@@ -43,8 +43,8 @@ if '${PACK}' == 'ON':
    copy_lib()

 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.11.0', 'numpy >= 1.12', 'grpcio >= 1.28.1',
-    'grpcio-tools >= 1.28.1'
+    'six >= 1.10.0', 'protobuf >= 3.11.0', 'numpy >= 1.12', 'grpcio <= 1.33.2',
+    'grpcio-tools <= 1.33.2'
 ]



--- a/python/setup.py.server.in
+++ b/python/setup.py.server.in
@@ -28,7 +28,7 @@ max_version, mid_version, min_version = util.python_version()
 util.gen_pipeline_code("paddle_serving_server")

 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.11.0', 'grpcio >= 1.28.1', 'grpcio-tools >= 1.28.1',
+    'six >= 1.10.0', 'protobuf >= 3.11.0', 'grpcio <= 1.33.2', 'grpcio-tools <= 1.33.2',
    'paddle_serving_client', 'flask >= 1.1.1', 'paddle_serving_app', 'func_timeout', 'pyyaml'
 ]


--- a/python/setup.py.server_gpu.in
+++ b/python/setup.py.server_gpu.in
@@ -30,7 +30,7 @@ max_version, mid_version, min_version = util.python_version()
 util.gen_pipeline_code("paddle_serving_server_gpu")

 REQUIRED_PACKAGES = [
-    'six >= 1.10.0', 'protobuf >= 3.11.0', 'grpcio >= 1.28.1', 'grpcio-tools >= 1.28.1',
+    'six >= 1.10.0', 'protobuf >= 3.11.0', 'grpcio <= 1.33.2', 'grpcio-tools <= 1.33.2',
    'paddle_serving_client', 'flask >= 1.1.1', 'paddle_serving_app', 'func_timeout', 'pyyaml'
 ]