fix pip install .whl bug of numpy-pandas

yongzhuo · yongzhuo · commit 1d7b8f9938cb · 2020-12-25T22:29:04.000+08:00
diff --git a/README.md b/README.md
@@ -22,6 +22,12 @@
 
 
 # 安装 
+0. 注意事项
+    ```
+	默认不安装nlg-yongzhuo, 如果需要该功能自行安装;
+	默认不指定numpy, pandas, scikit-learn版本, 过高或者过低的版本可能不支持
+	标准版本的依赖包详见 requirements-all.txt
+	```
 1. 通过PyPI安装(模型文件另需下载, 详见[命名实体提取](#命名实体提取), [词性标注](#词性标注))：
 	```
 	pip install macropodus
diff --git a/macropodus/version.py b/macropodus/version.py
@@ -5,4 +5,4 @@
 # @function: version of Macropodus
 
 
-__version__ = "0.0.6"
+__version__ = "0.0.7"
diff --git a/requirements-all.txt b/requirements-all.txt
@@ -8,3 +8,4 @@ networkx==2.4
 tensorflow-gpu==1.15.0
 keras-bert==0.80.0
 keras-adaptive-softmax==0.6.0
+nlg-yongzhuo==0.0.4
diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,7 @@
-scikit-learn==0.19.1
-nlg-yongzhuo==0.0.4
-pandas==0.23.4
+numpy
+pandas
+scikit-learn
 passlib==1.7.1
 gensim==3.7.1
-numpy==1.16.2
 tqdm==4.31.1
 networkx==2.4
diff --git a/setup.py b/setup.py
@@ -44,6 +44,7 @@
                      'Programming Language :: Python :: 3.6',
                      'Programming Language :: Python :: 3.7',
                      'Programming Language :: Python :: 3.8',
+                     'Programming Language :: Python :: 3.9',
                      'Programming Language :: Python :: Implementation :: CPython',
                      'Programming Language :: Python :: Implementation :: PyPy'],
       )

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@`
`5`	`5`	`# @function: version of Macropodus`
`6`	`6`
`7`	`7`
`8`		`-__version__ = "0.0.6"`
	`8`	`+__version__ = "0.0.7"`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@`
`44`	`44`	`'Programming Language :: Python :: 3.6',`
`45`	`45`	`'Programming Language :: Python :: 3.7',`
`46`	`46`	`'Programming Language :: Python :: 3.8',`
	`47`	`+ 'Programming Language :: Python :: 3.9',`
`47`	`48`	`'Programming Language :: Python :: Implementation :: CPython',`
`48`	`49`	`'Programming Language :: Python :: Implementation :: PyPy'],`
`49`	`50`	`)`