diff --git a/ChangeLog.md b/ChangeLog.md index 65ca99dd..417a437b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,5 @@ -Emperor 0.9.1 (changes since Emperor 0.9.0 go here) -=================================================== +Emperor 0.9.1 +============= *New features* @@ -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* @@ -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) =========================== diff --git a/emperor/__init__.py b/emperor/__init__.py index eb70c9d4..c1f414ec 100644 --- a/emperor/__init__.py +++ b/emperor/__init__.py @@ -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__ = "antgonza@gmail.com" -__status__ = "Development" +__status__ = "Release" __all__ = ['biplots', 'format', 'filter', 'sort', 'util'] diff --git a/emperor/biplots.py b/emperor/biplots.py index 90095b3c..f88d9c5a 100644 --- 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.0-dev" +__version__ = "0.9.1" __maintainer__ = "Yoshiki Vazquez Baeza" __email__ = "yoshiki89@gmail.com" -__status__ = "Development" +__status__ = "Release" from numpy import argsort, array diff --git a/emperor/filter.py b/emperor/filter.py index 561010e3..82c08944 100644 --- 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.0-dev" +__version__ = "0.9.1" __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 index 26eee2db..7bd7ebc1 100755 --- 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.0-dev" +__version__ = "0.9.1" __maintainer__ = "Yoshiki Vazquez Baeza" __email__ = "yoshiki89@gmail.com" -__status__ = "Development" +__status__ = "Release" from sys import argv diff --git a/emperor/sort.py b/emperor/sort.py index 7289d581..cabbc52b 100644 --- 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.0-dev" +__version__ = "0.9.1" __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/emperor.js b/emperor/support_files/emperor/js/emperor.js index dda37815..568db210 100644 --- a/emperor/support_files/emperor/js/emperor.js +++ b/emperor/support_files/emperor/js/emperor.js @@ -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__ = "meganap@gmail.com" - * __status__ = "Development" + * __status__ = "Release" */ // spheres and ellipses that are being displayed on screen diff --git a/emperor/util.py b/emperor/util.py index 68432904..68c122f0 100644 --- 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.0-dev" +__version__ = "0.9.1" __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 index e1242396..c2046172 100755 --- a/scripts/make_emperor.py +++ b/scripts/make_emperor.py @@ -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__ = "antgonza@gmail.com" -__status__ = "Development" +__status__ = "Release" from os import listdir from os.path import join, exists, isdir, abspath diff --git a/setup.py b/setup.py index f929bf51..7d9eaed7 100644 --- a/setup.py +++ b/setup.py @@ -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__ = "yoshiki89@gmail.com" -__status__ = "Development" +__status__ = "Release" # without any of these emperor will not function correctly required_python_modules = ['numpy', 'cogent', 'qiime'] diff --git a/tests/all_tests.py b/tests/all_tests.py index 3ff990e3..7cf86f05 100755 --- a/tests/all_tests.py +++ b/tests/all_tests.py @@ -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__ = "yoshiki89@gmail.com" -__status__ = "Development" +__status__ = "Release" script_info = {} diff --git a/tests/test_biplots.py b/tests/test_biplots.py index 1312847d..906bf260 100755 --- a/tests/test_biplots.py +++ b/tests/test_biplots.py @@ -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__ = "yoshiki89@gmail.com" -__status__ = "Development" +__status__ = "Release" from numpy import array from qiime.parse import parse_classic_otu_table diff --git a/tests/test_filter.py b/tests/test_filter.py index 3be8ef3f..d407b53e 100755 --- a/tests/test_filter.py +++ b/tests/test_filter.py @@ -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__ = "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 index 07cf0686..5df8708a 100755 --- a/tests/test_format.py +++ b/tests/test_format.py @@ -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__ = "yoshiki89@gmail.com" -__status__ = "Development" +__status__ = "Release" from numpy import array diff --git a/tests/test_sort.py b/tests/test_sort.py index fad0b198..a33830da 100755 --- a/tests/test_sort.py +++ b/tests/test_sort.py @@ -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__ = "yoshiki89@gmail.com" -__status__ = "Development" +__status__ = "Release" from numpy import array diff --git a/tests/test_util.py b/tests/test_util.py index a0873719..2ebf716a 100755 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -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__ = "yoshiki89@gmail.com" -__status__ = "Development" +__status__ = "Release" from numpy import array