From 7bd13e180b0b9bbaec80086a448afefad1d83f5f Mon Sep 17 00:00:00 2001
From: kinghuin <kinghuin_chull@163.com>
Date: Tue, 13 Aug 2019 11:17:26 +0800
Subject: [PATCH] fix pip error (#115)

---
 requirements.txt | 4 +++-
 setup.py         | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c99df35b..a7444b12 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,10 +3,12 @@ pre-commit
 protobuf >= 3.1.0
 yapf == 0.26.0
 pyyaml
-numpy >= 1.12.0
+numpy
+#[py2]numpy == 1.16.0
 Pillow
 six >= 1.10.0
 chardet == 3.0.4
 requests
 pandas
+#[py2]pandas == 0.24.0
 flake8
diff --git a/setup.py b/setup.py
index ba6ea6a4..e0148168 100644
--- a/setup.py
+++ b/setup.py
@@ -31,12 +31,14 @@ def python_version():
 max_version, mid_version, min_version = python_version()
 
 REQUIRED_PACKAGES = [
-    'numpy >= 1.12.0', 'six >= 1.10.0', 'pandas', 'protobuf >= 3.1.0', 'pyyaml',
-    'Pillow', 'requests', "visualdl >= 1.3.0"
+    'six >= 1.10.0', 'protobuf >= 3.1.0', 'pyyaml', 'Pillow', 'requests',
+    "visualdl >= 1.3.0"
 ]
 
 if max_version < 3:
-    REQUIRED_PACKAGES += ["enum"]
+    REQUIRED_PACKAGES += ["enum", "numpy == 1.16.0", "pandas == 0.24.0"]
+else:
+    REQUIRED_PACKAGES += ["numpy", "pandas"]
 
 setup(
     name='paddlehub',
-- 
GitLab