diff --git a/requirements.txt b/requirements.txt index a81b80d467e022e01e0fc891e1fcde8fbcb4bcac..5011ce56b62d63cbf8578bed5473deb8608917cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,11 @@ -#for python2, you should use requirements_py2.txt pre-commit protobuf >= 3.6.0 yapf == 0.26.0 pyyaml -numpy Pillow six >= 1.10.0 chardet == 3.0.4 requests -pandas flask >= 1.1.0 flake8 tb-paddle @@ -17,3 +14,11 @@ cma == 2.7.0 sentencepiece nltk colorlog + +# numpy no longer support python2 in version 1.17 and above +numpy ; python_version >= "3" +numpy < 1.17.0 ; python_version < "3" + +# pandas no longer support python2 in version 0.25 and above +pandas ; python_version >= "3" +pandas < 0.25.0 ; python_version < "3" diff --git a/requirements_py2.txt b/requirements_py2.txt deleted file mode 100644 index eb34d62eebfc0f65c1e084d24f54bf1f57519355..0000000000000000000000000000000000000000 --- a/requirements_py2.txt +++ /dev/null @@ -1,18 +0,0 @@ -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 -flask >= 1.1.0 -tb-paddle -tensorboard >= 1.15 -cma == 2.7.0 -sentencepiece -nltk -colorlog