modify py2 numpy&pandas version (#163)

* modify py2 numpy&pandas version * modify requirements

modify py2 numpy&pandas version (#163)
* modify py2 numpy&pandas version * modify requirements
0622079e · kinghuin · wuzewu · ed806788 · 0622079e · 0622079e
显示空白变更内容
内联并排

Showing with 16 addition and 3 deletion

requirements.txt requirements.txt +1 -2

requirements_py2.txt requirements_py2.txt +14 -0

setup.py setup.py +1 -1

未找到文件。
--- a/requirements.txt
+++ b/requirements.txt
+#for python2, you should use requirements_py2.txt
 pre-commit
 protobuf >= 3.1.0
 yapf == 0.26.0
 pyyaml
 numpy
-#[py2]numpy == 1.16.0
 Pillow
 six >= 1.10.0
 chardet == 3.0.4
 requests
 pandas
-#[py2]pandas == 0.24.0
 flake8
 tb-paddle
 tb-nightly

--- a/requirements_py2.txt
+++ b/requirements_py2.txt
+pre-commit
+protobuf >= 3.1.0
+yapf == 0.26.0
+pyyaml
+numpy < 1.17.0
+Pillow
+six >= 1.10.0
+chardet == 3.0.4
+requests
+pandas < 0.25.0
+flake8
+tb-paddle
+tb-nightly
+cma == 2.7.0
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ REQUIRED_PACKAGES = [
 ]

 if max_version < 3:
-    REQUIRED_PACKAGES += ["numpy == 1.16.0", "pandas == 0.24.0"]
+    REQUIRED_PACKAGES += ["numpy < 1.17.0", "pandas < 0.25.0"]
 else:
    REQUIRED_PACKAGES += ["numpy", "pandas"]