From ccd22ae1e7bdd7ce6671462202f433bd232856a8 Mon Sep 17 00:00:00 2001 From: Yusuke Niitani Date: Fri, 7 Jul 2017 15:52:10 +0900 Subject: [PATCH 1/4] update version 0.6.0 --- docs/source/conf.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index cf37cd7609..ae2ec8180e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -71,9 +71,9 @@ # built documents. # # The short X.Y version. -version = u'0.5.1' +version = u'0.6.0' # The full version, including alpha/beta/rc tags. -release = u'0.5.1' +release = u'0.6.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 9de3448a00..d3366df9d8 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ def build_extensions(self): setup( name='chainercv', - version='0.5.1', + version='0.6.0', packages=find_packages(), author='Yusuke Niitani', author_email='yuyuniitani@gmail.com', From a00692d687d31f8813d073480ca658bdbc158251 Mon Sep 17 00:00:00 2001 From: Yusuke Niitani Date: Fri, 7 Jul 2017 18:23:21 +0900 Subject: [PATCH 2/4] update README --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 358f72cb84..f7503703ed 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,11 @@ These are the outputs of the detection models supported by ChainerCV. # Installation -``` +```bash +# Chainer v2 $ pip install chainercv +# Chainer v3 +$ pip install chainercv==0.7.0a1 ``` The instruction on installation using Anaconda is [here](http://chainercv.readthedocs.io/en/stable/#install-guide) (recommended). @@ -35,8 +38,10 @@ For additional features Environments under Python 2.7.12 and 3.6.0 are tested. -The HEAD of the master branch is developed for Chainer v2. -For users using Chainer v1, please use version 0.4.11, which can be installed by `pip install chainercv==0.4.11`. ++ The HEAD of the master branch is developed for Chainer v3. ++ For users using Chainer v1, please use version `0.4.11`, which can be installed by `pip install chainercv==0.4.11`. ++ For users using Chainer v2, please use version `0.6.*`. ++ For users using Chainer v3, please use version `0.7.*`. # Features From e3db10848e584810766d52cdac98becd3d015a93 Mon Sep 17 00:00:00 2001 From: Yusuke Niitani Date: Wed, 12 Jul 2017 19:07:14 +0900 Subject: [PATCH 3/4] update README --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f7503703ed..addfb0131b 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,7 @@ These are the outputs of the detection models supported by ChainerCV. # Installation ```bash -# Chainer v2 $ pip install chainercv -# Chainer v3 -$ pip install chainercv==0.7.0a1 ``` The instruction on installation using Anaconda is [here](http://chainercv.readthedocs.io/en/stable/#install-guide) (recommended). @@ -38,10 +35,8 @@ For additional features Environments under Python 2.7.12 and 3.6.0 are tested. -+ The HEAD of the master branch is developed for Chainer v3. -+ For users using Chainer v1, please use version `0.4.11`, which can be installed by `pip install chainercv==0.4.11`. -+ For users using Chainer v2, please use version `0.6.*`. -+ For users using Chainer v3, please use version `0.7.*`. ++ The master branch will work on both development and stable version of Chainer. ++ For users using Chainer v1, please use version `0.4.11`, which can be installed by `pip install chainercv==0.4.11`. This branch is unmaintained. # Features From 9363f382e1a17dc48591485fe95042eb769e1fa4 Mon Sep 17 00:00:00 2001 From: Yusuke Niitani Date: Thu, 13 Jul 2017 09:43:33 +0900 Subject: [PATCH 4/4] be explicit about the version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index addfb0131b..26f95d0c4c 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ For additional features Environments under Python 2.7.12 and 3.6.0 are tested. -+ The master branch will work on both development and stable version of Chainer. ++ The master branch will work on both the stable version (v2) and the development version (v3). + For users using Chainer v1, please use version `0.4.11`, which can be installed by `pip install chainercv==0.4.11`. This branch is unmaintained.