Merge pull request #1669 from felixhjh/official_develop

Official develop

python/requirements.txt

@@ -4,7 +4,7 @@ wheel>=0.34.0, <0.35.0
 setuptools>=44.1.0
 google>=2.0.3
 protobuf>=3.12.2
-grpcio-tools>=1.28.1
+grpcio-tools==1.33.2
 grpcio>=1.28.1
 func-timeout>=4.3.5
 pyyaml>=5.1
@@ -22,4 +22,4 @@ opencv-python==4.3.0.38; platform_machine !=  "aarch64"
 opencv-python; platform_machine == "aarch64"
 pytest==7.0.1
 prometheus-client==0.12.0
-pillow==9.0.1
+pillow==8.4.0

python/requirements_mac.txt

@@ -14,7 +14,7 @@ Jinja2==2.11.3
 MarkupSafe==1.1.1
 Werkzeug==1.0.1
 ujson>=2.0.3
-grpcio-tools>=1.33.2
+grpcio-tools==1.33.2
 grpcio>=1.33.2
 sentencepiece==0.1.83
-pillow==9.0.1
+pillow==8.4.0

python/setup.py.client.in

@@ -44,7 +44,7 @@ if '${PACK}' == 'ON':
 
 REQUIRED_PACKAGES = [
     'six >= 1.10.0', 'protobuf >= 3.11.0', 'numpy >= 1.12', 'grpcio <= 1.33.2',
-    'grpcio-tools >= 1.28.1', 'requests'
+    'grpcio-tools <= 1.33.2', 'requests'
 ]
 
 

python/setup.py.server.in

@@ -32,7 +32,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.33.2', 'grpcio-tools >= 1.28.1',
+    'six >= 1.10.0', 'protobuf >= 3.11.0', 'grpcio <= 1.33.2', 'grpcio-tools <= 1.33.2',
     'flask >= 1.1.1,<2.0.0', 'click==7.1.2', 'itsdangerous==1.1.0', 'Jinja2==2.11.3',
     'MarkupSafe==1.1.1', 'Werkzeug==1.0.1', 'func_timeout', 'pyyaml', 'pytest'
 ]