Skip to content

Commit

Permalink
Merge pull request #319 from ElDeveloper/release-0.9.5
Browse files Browse the repository at this point in the history
REL: Update version to 0.9.5
  • Loading branch information
antgonza committed Nov 14, 2014
2 parents 1959cb7 + f6e8b15 commit 26788d6
Show file tree
Hide file tree
Showing 32 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions emperor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions emperor/biplots.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions emperor/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emperor/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions emperor/format.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emperor/parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions emperor/qiime_backports/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
4 changes: 2 additions & 2 deletions emperor/sort.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emperor/support_files/emperor/js/animate.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions emperor/support_files/emperor/js/draw.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions emperor/support_files/emperor/js/emperor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions emperor/support_files/emperor/js/trajectory.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions emperor/support_files/emperor/js/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions emperor/support_files/emperor/js/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions emperor/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/make_emperor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = """
Expand Down
4 changes: 2 additions & 2 deletions tests/all_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down
4 changes: 2 additions & 2 deletions tests/javascript_tests/test_animate.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions tests/javascript_tests/test_draw.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions tests/javascript_tests/test_trajectory.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions tests/javascript_tests/test_ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions tests/javascript_tests/test_util.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down
4 changes: 2 additions & 2 deletions tests/test_biplots.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tests/test_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions tests/test_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/test_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/test_sort.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 26788d6

Please sign in to comment.