Browse Source

set version to 2.0.0rc4

FlyingQianMM 4 years ago
parent
commit
b711f89205
5 changed files with 11 additions and 13 deletions
  1. 0 1
      MANIFEST.in
  2. 6 6
      docs/install.md
  3. 1 1
      paddlex/__init__.py
  4. 2 2
      requirements.txt
  5. 2 3
      setup.py

+ 0 - 1
MANIFEST.in

@@ -1 +0,0 @@
-include paddlex_restful/restful/templates/paddlex_restful_demo.html 

+ 6 - 6
docs/install.md

@@ -16,14 +16,14 @@
 以下安装过程默认用户已安装好**paddlepaddle-gpu或paddlepaddle(版本大于或等于2.1.0)**,paddlepaddle安装方式参照[飞桨官网](https://www.paddlepaddle.org.cn/install/quick?docurl=/documentation/docs/zh/develop/install/pip/windows-pip.html)
 
 
-### PaddleX 2.0.0-rc3安装
+### PaddleX 2.0.0-rc4安装
 
 #### * Linux / macOS 操作系统
 
-使用pip安装方式安装2.0.0-rc3版本:
+使用pip安装方式安装2.0.0-rc4版本:
 
 ```
-pip install paddlex==2.0.0rc3 -i https://mirror.baidu.com/pypi/simple
+pip install paddlex==2.0.0rc4 -i https://mirror.baidu.com/pypi/simple
 ```
 
 因PaddleX依赖pycocotools包,如遇到pycocotools安装失败,可参照如下方式安装pycocotools:
@@ -38,10 +38,10 @@ pip install pycocotools
 #### * Windows 操作系统
 
 
-使用pip安装方式安装2.0.0-rc3版本:
+使用pip安装方式安装2.0.0-rc4版本:
 
 ```
-pip install paddlex==2.0.0rc3 -i https://mirror.baidu.com/pypi/simple
+pip install paddlex==2.0.0rc4 -i https://mirror.baidu.com/pypi/simple
 ```
 
 因PaddleX依赖pycocotools包,Windows安装时可能会提示`Microsoft Visual C++ 14.0 is required`,从而导致安装出错,[点击下载VC build tools](https://go.microsoft.com/fwlink/?LinkId=691126)安装再执行如下pip命令
@@ -63,7 +63,7 @@ pip install -r requirements.txt
 python setup.py install
 ```
 
-如遇到pycocotools安装失败,参考[PaddleX 2.0.0-rc3安装](./install.md#paddlex-200-rc3安装)中介绍的解决方法。
+如遇到pycocotools安装失败,参考[PaddleX 2.0.0-rc4安装](./install.md#paddlex-200-rc4安装)中介绍的解决方法。
 
 ## <h2 id="2">2. PadldeX GUI开发模式安装</h2>
 

+ 1 - 1
paddlex/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '2.0.0rc3'
+__version__ = '2.0.0rc4'
 
 from paddlex.utils.env import get_environ_info, init_parallel_env
 init_parallel_env()

+ 2 - 2
requirements.txt

@@ -1,5 +1,5 @@
 tqdm
-scipy==1.5.4
+scipy
 colorama
 cython
 pycocotools
@@ -11,4 +11,4 @@ opencv-python
 scikit-learn==0.23.2
 lap
 motmetrics
-matplotlib==3.3.4
+matplotlib

+ 2 - 3
setup.py

@@ -19,7 +19,7 @@ long_description = "PaddlePaddle Entire Process Development Toolkit"
 
 setuptools.setup(
     name="paddlex",
-    version='2.0.0rc3',
+    version='2.0.0rc4',
     author="paddlex",
     author_email="paddlex@baidu.com",
     description=long_description,
@@ -31,8 +31,7 @@ setuptools.setup(
     install_requires=[
         "pycocotools;platform_system!='Windows'", 'pyyaml', 'colorama', 'tqdm',
         'paddleslim==2.1.0', 'visualdl>=2.1.1', 'shapely>=1.7.0',
-        'opencv-python', 'scipy==1.5.4', 'lap', 'motmetrics',
-        'scikit-learn==0.23.2', 'matplotlib==3.3.4'
+        'opencv-python', 'scipy', 'lap', 'motmetrics', 'scikit-learn==0.23.2'
     ],
     classifiers=[
         "Programming Language :: Python :: 3",