Skip to content

Commit

Permalink
Merge pull request #200 from ElDeveloper/release_0.9.1
Browse files Browse the repository at this point in the history
Release 0.9.1
  • Loading branch information
antgonza committed Oct 21, 2013
2 parents 2e7ef66 + 9a88840 commit 22e56ad
Show file tree
Hide file tree
Showing 16 changed files with 44 additions and 38 deletions.
10 changes: 8 additions & 2 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Emperor 0.9.1 (changes since Emperor 0.9.0 go here)
===================================================
Emperor 0.9.1
=============

*New features*

Expand All @@ -22,6 +22,8 @@ Emperor 0.9.1 (changes since Emperor 0.9.0 go here)
* Add color pickers for connecting bars in coordinate comparison plots.
* Add option to select a master set of coordinates when making a comparison plot.
* Adds a feature to negate axes. With this feature you can negate the coordinates of each data point. As a result, the spheres and/or edges will be adjusted appropriately.
* Minor additions to the separator controller for the side bar.
* As of 308629f550ff3e108903d3bcf1ce76ce85f4cb96 Emperor is now released under a BSD license.


*Bug Fixes*
Expand All @@ -33,6 +35,10 @@ Emperor 0.9.1 (changes since Emperor 0.9.0 go here)
* Comparison bars checkbox now accurately reflects status of the visiblity rather than opposite.
* Scaling by percent explained now works with vectors and coordinate comparison plots.
* Fixed bug where only the first bars in coordinate comparison plots could be hidden.
* Improved documentation for saving and exporting images.
* Emperor now fails graciously when WebGL is not enabled and gives you a few suggestions on how to get it to work.



Emperor 0.9.0 (14 May 2013)
===========================
Expand Down
4 changes: 2 additions & 2 deletions emperor/__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__ = ["Antonio Gonzalez Pena", "Meg Pirrung", "Yoshiki Vazquez Baeza"]
__license__ = "BSD"
__version__ = "0.9.0-dev"
__version__ = "0.9.1"
__maintainer__ = "Antonio Gonzalez Pena"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"

__all__ = ['biplots', 'format', 'filter', 'sort', 'util']
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.0-dev"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"

from numpy import argsort, array

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.0-dev"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__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.0-dev"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"


from sys import argv
Expand Down
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.0-dev"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__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/emperor.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* __copyright__ = "Copyright 2013, Emperor"
* __credits__ = ["Meg Pirrung","Antonio Gonzalez Pena","Yoshiki Vazquez Baeza","Jackson Chen"]
* __license__ = "BSD"
* __version__ = "0.9.0-dev"
* __version__ = "0.9.1"
* __maintainer__ = "Meg Pirrung"
* __email__ = "[email protected]"
* __status__ = "Development"
* __status__ = "Release"
*/

// spheres and ellipses that are being displayed on screen
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.0-dev"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__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 @@ -6,10 +6,10 @@
__copyright__ = "Copyright 2013, The Emperor Project"
__credits__ = ["Antonio Gonzalez Pena", "Yoshiki Vazquez Baeza"]
__license__ = "BSD"
__version__ = "0.9.0-dev"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"

from os import listdir
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 @@ -7,10 +7,10 @@
__copyright__ = "Copyright 2013, The Emperor Project"
__credits__ = ["Antonio Gonzalez Pena", "Meg Pirrung", "Yoshiki Vazquez Baeza"]
__license__ = "BSD"
__version__ = "0.9.0-dev"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"

# without any of these emperor will not function correctly
required_python_modules = ['numpy', 'cogent', 'qiime']
Expand Down
6 changes: 3 additions & 3 deletions tests/all_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
__copyright__ = "Copyright 2013, The Emperor Project" #consider project name
__credits__ = ["Rob Knight","Greg Caporaso", "Jai Ram Rideout",
"Yoshiki Vazquez-Baeza"] #remember to add yourself if you make changes
__license__ = "GPL"
__version__ = "0.9.0-dev"
__license__ = "BSD"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez-Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"


script_info = {}
Expand Down
6 changes: 3 additions & 3 deletions tests/test_biplots.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
__author__ = "Yoshiki Vazquez Baeza"
__copyright__ = "Copyright 2013, The Emperor Project"
__credits__ = ["Yoshiki Vazquez Baeza"]
__license__ = "GPL"
__version__ = "0.9.0-dev"
__license__ = "BSD"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"

from numpy import array
from qiime.parse import parse_classic_otu_table
Expand Down
6 changes: 3 additions & 3 deletions tests/test_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
__author__ = "Yoshiki Vazquez Baeza"
__copyright__ = "Copyright 2013, The Emperor Project"
__credits__ = ["Yoshiki Vazquez Baeza"]
__license__ = "GPL"
__version__ = "0.9.0-dev"
__license__ = "BSD"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"

from numpy import array
from emperor.filter import (filter_samples_from_coords,
Expand Down
6 changes: 3 additions & 3 deletions tests/test_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
__author__ = "Yoshiki Vazquez Baeza"
__copyright__ = "Copyright 2013, The Emperor Project"
__credits__ = ["Yoshiki Vazquez Baeza"]
__license__ = "GPL"
__version__ = "0.9.0-dev"
__license__ = "BSD"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"


from numpy import array
Expand Down
6 changes: 3 additions & 3 deletions tests/test_sort.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
__author__ = "Yoshiki Vazquez Baeza"
__copyright__ = "Copyright 2013, The Emperor Project"
__credits__ = ["Yoshiki Vazquez Baeza"]
__license__ = "GPL"
__version__ = "0.9.0-dev"
__license__ = "BSD"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"


from numpy import array
Expand Down
6 changes: 3 additions & 3 deletions tests/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
__author__ = "Yoshiki Vazquez Baeza"
__copyright__ = "Copyright 2013, The Emperor Project"
__credits__ = ["Yoshiki Vazquez Baeza"]
__license__ = "GPL"
__version__ = "0.9.0-dev"
__license__ = "BSD"
__version__ = "0.9.1"
__maintainer__ = "Yoshiki Vazquez Baeza"
__email__ = "[email protected]"
__status__ = "Development"
__status__ = "Release"


from numpy import array
Expand Down

0 comments on commit 22e56ad

Please sign in to comment.