Merge pull request #319 from ElDeveloper/release-0.9.5

REL: Update version to 0.9.5
biocore · Nov 14, 2014 · cb9c4bb · cb9c4bb
2 parents 1959cb7 + f6e8b15
commit cb9c4bb
Show file tree

Hide file tree

Showing 32 changed files with 65 additions and 65 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,8 +1,8 @@
 Emperor ChangeLog
 =================
 
-Emperor 0.9.4-dev (changes since Emperor 0.9.4 go here)
--------------------------------------------------------
+Emperor 0.9.5 (14 Nov 2014)
+---------------------------
 
 * Add `make_emperor.py` script auto-generated documentation.
 * Add numpydoc generated documentation setup.

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -65,9 +65,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.4-dev'
+version = '0.9.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.4-dev'
+release = '0.9.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/emperor/__init__.py b/emperor/__init__.py
@@ -5,10 +5,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Antonio Gonzalez Pena", "Meg Pirrung", "Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Antonio Gonzalez Pena"
 __email__ = "antgonza@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from emperor.core import Emperor
 

diff --git a/emperor/biplots.py b/emperor/biplots.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from numpy import argsort, array
 

diff --git a/emperor/core.py b/emperor/core.py
@@ -30,10 +30,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 class Emperor(object):
     """Display principal coordinates analysis plots

diff --git a/emperor/filter.py b/emperor/filter.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from numpy import array
 

diff --git a/emperor/format.py b/emperor/format.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Meg Pirrung", "Antonio Gonzalez Pena", "Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 
 from sys import argv

diff --git a/emperor/parse.py b/emperor/parse.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Jose Antonio Navas Molina"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Jose Antonio Navas Molina"
 __email__ = "josenavasmolina@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from StringIO import StringIO
 

diff --git a/emperor/qiime_backports/__init__.py b/emperor/qiime_backports/__init__.py
@@ -5,9 +5,9 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 __all__ = ['biplots', 'filter', 'format', 'make_3d_plots', 'parse', 'util']
diff --git a/emperor/sort.py b/emperor/sort.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from numpy import zeros
 from re import compile, search

diff --git a/emperor/support_files/emperor/js/animate.js b/emperor/support_files/emperor/js/animate.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/emperor/support_files/emperor/js/draw.js b/emperor/support_files/emperor/js/draw.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/emperor/support_files/emperor/js/emperor.js b/emperor/support_files/emperor/js/emperor.js
@@ -4,10 +4,10 @@
  * __credits__ = ["Meg Pirrung","Antonio Gonzalez Pena","Yoshiki Vazquez Baeza",
  *                "Jackson Chen", "Emily TerAvest"]
  * __license__ = "BSD"
- * __version__ = "0.9.4-dev"
+ * __version__ = "0.9.5"
  * __maintainer__ = "Meg Pirrung"
  * __email__ = "meganap@gmail.com"
- * __status__ = "Development"
+ * __status__ = "Release"
  */
 
 // spheres and ellipses that are being displayed on screen

diff --git a/emperor/support_files/emperor/js/trajectory.js b/emperor/support_files/emperor/js/trajectory.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/emperor/support_files/emperor/js/ui.js b/emperor/support_files/emperor/js/ui.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/emperor/support_files/emperor/js/util.js b/emperor/support_files/emperor/js/util.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/emperor/util.py b/emperor/util.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza", "Antonio Gonzalez Pena"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 
 from numpy import ndarray, array, ones, zeros, vstack

diff --git a/scripts/make_emperor.py b/scripts/make_emperor.py
@@ -7,10 +7,10 @@
 __credits__ = ["Antonio Gonzalez Pena", "Yoshiki Vazquez Baeza",
                "Jose Antonio Navas Molina"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "antgonza@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from os import listdir, makedirs
 from os.path import join, exists, isdir, abspath

diff --git a/setup.py b/setup.py
@@ -8,10 +8,10 @@
 __credits__ = ["Antonio Gonzalez Pena", "Meg Pirrung", "Yoshiki Vazquez Baeza",
                "Jose Antonio Navas Molina", "Greg Caporaso"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 # based on the text found in github.com/qiime/pynast
 classes = """
@@ -56,7 +56,7 @@
             'support_files/emperor/js/*.js',]},
         data_files={},
         install_requires=["numpy >= 1.7", "qcli",
-                          "scikit-bio == 0.2.1"],
+                          "scikit-bio >= 0.2.1, < 0.3.0"],
         extras_require={'doc': ["Sphinx >= 1.2.2", "sphinx-bootstrap-theme"]},
         long_description=long_description,
         classifiers=classifiers)
diff --git a/tests/all_tests.py b/tests/all_tests.py
@@ -24,10 +24,10 @@
 __credits__ = ["Rob Knight","Greg Caporaso", "Jai Ram Rideout",
     "Yoshiki Vazquez-Baeza"] #remember to add yourself if you make changes
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez-Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 
 script_info = {}

diff --git a/tests/javascript_tests/test_animate.js b/tests/javascript_tests/test_animate.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/tests/javascript_tests/test_draw.js b/tests/javascript_tests/test_draw.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/tests/javascript_tests/test_trajectory.js b/tests/javascript_tests/test_trajectory.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/tests/javascript_tests/test_ui.js b/tests/javascript_tests/test_ui.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/tests/javascript_tests/test_util.js b/tests/javascript_tests/test_util.js
@@ -4,10 +4,10 @@
  * @copyright Copyright 2013, The Emperor Project
  * @credits Yoshiki Vazquez Baeza
  * @license BSD
- * @version 0.9.4-dev
+ * @version 0.9.5
  * @maintainer Yoshiki Vazquez Baeza
  * @email yoshiki89@gmail.com
- * @status Development
+ * @status Release
  *
  */
 

diff --git a/tests/test_biplots.py b/tests/test_biplots.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from unittest import TestCase, main
 

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from unittest import TestCase, main
 

diff --git a/tests/test_filter.py b/tests/test_filter.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from numpy import array
 from emperor.filter import (filter_samples_from_coords,

diff --git a/tests/test_format.py b/tests/test_format.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Yoshiki Vazquez Baeza"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Yoshiki Vazquez Baeza"
 __email__ = "yoshiki89@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 
 from numpy import array

diff --git a/tests/test_parse.py b/tests/test_parse.py
@@ -6,10 +6,10 @@
 __copyright__ = "Copyright 2013, The Emperor Project"
 __credits__ = ["Jose Antonio Navas Molina"]
 __license__ = "BSD"
-__version__ = "0.9.4-dev"
+__version__ = "0.9.5"
 __maintainer__ = "Jose Antonio Navas Molina"
 __email__ = "josenavasmolina@gmail.com"
-__status__ = "Development"
+__status__ = "Release"
 
 from unittest import TestCase, main
 from tempfile import mkstemp