From 0622079e90fab62427c17cb8ff716146529e3e14 Mon Sep 17 00:00:00 2001 From: kinghuin Date: Fri, 20 Sep 2019 10:20:19 +0800 Subject: [PATCH] modify py2 numpy&pandas version (#163) * modify py2 numpy&pandas version * modify requirements --- requirements.txt | 3 +-- requirements_py2.txt | 14 ++++++++++++++ setup.py | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 requirements_py2.txt diff --git a/requirements.txt b/requirements.txt index 678f736f..3e2b8960 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,14 @@ +#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 diff --git a/requirements_py2.txt b/requirements_py2.txt new file mode 100644 index 00000000..3557a744 --- /dev/null +++ b/requirements_py2.txt @@ -0,0 +1,14 @@ +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 diff --git a/setup.py b/setup.py index 867d9fdf..93d9b1a8 100644 --- 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"] -- GitLab