Merge branch 'master' of https://github.com/PaddlePaddle/PaddleHub

.pre-commit-config.yaml

+-   repo: https://github.com/pre-commit/mirrors-yapf.git
+    sha: v0.16.0
+    hooks:
+    -   id: yapf
+        files: \.py$
+
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    sha: a11d9314b22d8f8c7556443875b731ef05965464
+    hooks:
+    -   id: check-merge-conflict
+    -   id: check-symlinks
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+    -   id: detect-private-key
+    -   id: check-symlinks
+    -   id: check-added-large-files

requirements.txt

 paddlepaddle
+pre-commit

setup.py

@@ -24,7 +24,7 @@ __version__ = "0.1.0-dev"
 REQUIRED_PACKAGES = [
     'numpy >= 1.12.0',
     'six >= 1.10.0',
-    'protobuf >= 3.4.0',
+    'protobuf >= 3.1.0',
 ]
 
 setup(
@@ -59,5 +59,4 @@ setup(
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     license='Apache 2.0',
-    keywords=('paddlepaddle pretrained paddle-hub'),
-)
+    keywords=('paddlepaddle pretrained paddle-hub'), )