Merge pull request #104 from SciTools-incubator/vn0.6.17

Corrected the sort for T+ type sorting, vn0.6.17 release
SciTools-incubator · May 3, 2018 · feb0b7a · feb0b7a
2 parents dfc6250 + 94b9ab6
commit feb0b7a
Show file tree

Hide file tree

Showing 46 changed files with 1,422 additions and 1,392 deletions.
diff --git a/ImageMetaTag/__init__.py b/ImageMetaTag/__init__.py
@@ -21,7 +21,7 @@
 '''
 
 # see release_process for details on incrementing the version
-__version__ = '0.6.16'
+__version__ = '0.6.17'
 __documentation__ = 'http://scitools-incubator.github.io/image-meta-tag/build/html/'
 
 # list fo file formats which are valid for saving metadata to:

diff --git a/ImageMetaTag/img_dict.py b/ImageMetaTag/img_dict.py
@@ -521,7 +521,7 @@ def sort_keys(self, sort_methods, devmode=False):
                         none_keys.sort(reverse=True)
                     # and pull out the labels, in the right order,
                     # with the none_keys go at the end:
-                    self.keys[i_key] = [x[0] for x in labels_and_values] + none_keys
+                    self.keys[i_key] = [x[1] for x in values_and_labels] + none_keys
 
                 elif method in ['level', 'numeric', 'reverse_level', 'reverse_numeric']:
                     #'level' - starting with the surface and working upwards, then 'special'

diff --git a/ImageMetaTag/javascript/imt_dropdown.js b/ImageMetaTag/javascript/imt_dropdown.js
@@ -1,4 +1,4 @@
-// ImageMetaTag dropdown menu scripting - vn0.6.16
+// ImageMetaTag dropdown menu scripting - vn0.6.17
 // ImageMetaTag is a python package built around a wrapper for savefig in 
 // matplotlib, which adds metadata tags to supported image file formats.
 // See https://github.com/SciTools-incubator/image-meta-tag for details.

diff --git a/docs/build/doctrees/ImageDict.doctree b/docs/build/doctrees/ImageDict.doctree
diff --git a/docs/build/doctrees/db.doctree b/docs/build/doctrees/db.doctree
diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle
diff --git a/docs/build/doctrees/index.doctree b/docs/build/doctrees/index.doctree
diff --git a/docs/build/doctrees/savefig.doctree b/docs/build/doctrees/savefig.doctree
diff --git a/docs/build/doctrees/simple.doctree b/docs/build/doctrees/simple.doctree
diff --git a/docs/build/doctrees/test.doctree b/docs/build/doctrees/test.doctree
diff --git a/docs/build/doctrees/versions.doctree b/docs/build/doctrees/versions.doctree
diff --git a/docs/build/doctrees/webpage.doctree b/docs/build/doctrees/webpage.doctree
diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 5e6c2e3f0744a3f3ab7594f8fcc3a172
+config: e55f85c73ebb0967909908496063fa65
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/ImageDict.html b/docs/build/html/ImageDict.html
diff --git a/docs/build/html/_modules/ImageMetaTag.html b/docs/build/html/_modules/ImageMetaTag.html