Merge pull request #79 from SciTools-incubator/conda_fix_0.6.6

Change to setup.py, to hopefully fix conda installs.
SciTools-incubator · Oct 12, 2017 · 30f957e · 30f957e
2 parents b7a4d50 + 33cb0db
commit 30f957e
Show file tree

Hide file tree

Showing 50 changed files with 14,232 additions and 1,329 deletions.
diff --git a/ImageMetaTag/__init__.py b/ImageMetaTag/__init__.py
@@ -20,7 +20,7 @@
 Released under BSD 3-Clause License. See LICENSE for more details.
 '''
 
-__version__ = '0.6.5'
+__version__ = '0.6.6'
 # for consistency, the version here should match:
 # ImageMetaTag/__init__.py
 # ImageMetaTag/javascript/imt_dropdown.js

diff --git a/ImageMetaTag/db.py b/ImageMetaTag/db.py
@@ -658,8 +658,9 @@ def scan_dir_for_db(basedir, db_file, img_tag_req=None, subdir_excl_list=None,
                          for instance, will prevent the image thumbnails being included.
      * no_file_ext - logical to exclude the file extension in the filenames saved to the database.
      * known_file_tags - if supplied, this is a dict (keyed by filename entry),\
-                         contains a dictionary of {filename: {tag name: value}} already known\
-                         (so you don't need to read them from the files themselves). This is very\
+                         contains a dictionary, structured: {filename: {tag name: value}} \
+                         for the images that are already known (so you don't need to read them \
+                         from the files themselves as that is slow). This can be useful \
                          if you have a old backup of a database file that needs updating.
      * restart_db - if True, the db_file will be restarted from an empty database.
      * verbose - verbose output.

diff --git a/ImageMetaTag/javascript/imt_dropdown.js b/ImageMetaTag/javascript/imt_dropdown.js
@@ -1,4 +1,4 @@
-// ImageMetaTag dropdown menu scripting - vn0.6.5
+// ImageMetaTag dropdown menu scripting - vn0.6.6
 // 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: 3cb8bd52eecad3f57ba006a24566841b
+config: de441f110ba3c2e4d28d073d091894cb
 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