Merge pull request #140 from SciTools-incubator/origin/vn0p7p11_release

Origin/vn0p7p11 release
SciTools-incubator · Aug 4, 2022 · 8b1e9bf · 8b1e9bf
2 parents e8703b9 + 471b9ce
commit 8b1e9bf
Show file tree

Hide file tree

Showing 58 changed files with 5,341 additions and 4,162 deletions.
diff --git a/ImageMetaTag/__init__.py b/ImageMetaTag/__init__.py
@@ -25,7 +25,7 @@
 
 # Set constants/properties of ImageMetaTag (before any of it is imported)
 # see release_process for details on incrementing the version
-__version__ = '0.7.10'
+__version__ = '0.7.11'
 __documentation__ = 'http:https://scitools-incubator.github.io/image-meta-tag/build/html/'
 # list fo file formats which are valid for saving metadata to:
 META_IMG_FORMATS = ['png']

diff --git a/ImageMetaTag/javascript/imt_dropdown.js b/ImageMetaTag/javascript/imt_dropdown.js
@@ -1,4 +1,4 @@
-// ImageMetaTag dropdown menu scripting - vn0.7.10
+// ImageMetaTag dropdown menu scripting - vn0.7.11
 // 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/README.md b/README.md
@@ -4,7 +4,7 @@ Once the images have been tagged, it can also be used to manage an SQL database
 
 As the image metadata tagging process involves reading the image using the Image library, a few common image post-processing options are included such as cropping, logo addition and colour palette manipulation to reduce filesizes.
 
-All ImageMetaTag source code, unless explicitly stated, is © British Crown copyright, 2015-2020 and is released under a [BSD 3-Clause License](LICENSE). Details on how to contribute to ImageMetaTag are given [here](CONTRIBUTING.md).
+All ImageMetaTag source code, unless explicitly stated, is © British Crown copyright, 2015-2022 and is released under a [BSD 3-Clause License](LICENSE). Details on how to contribute to ImageMetaTag are given [here](CONTRIBUTING.md).
 
 The file ImageMetaTag/javascript/pako_inflate.js has been copied from [pako](https://github.com/nodeca/pako "pako") and is © 2014-2017 by Vitaly Puzrin and Andrei Tuputcyn and released under a MIT License, detailed within the file.
 

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/scripts.doctree b/docs/build/doctrees/scripts.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: 2c8c67628c7f3481cd7a248b66a304c3
+config: 8f9322596a1fa5883135b12c7ea31e19
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/ImageDict.html b/docs/build/html/ImageDict.html
diff --git a/docs/build/html/_modules/ImageMetaTag/db.html b/docs/build/html/_modules/ImageMetaTag/db.html
@@ -1,19 +1,17 @@
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http:https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 
-<html xmlns="http:https://www.w3.org/1999/xhtml">
+<html>
  <head>
- <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>ImageMetaTag.db &#8212; ImageMetaTag 0.7.10 documentation</title>
- <link rel="stylesheet" href="../../_static/sphinxdoc.css" type="text/css" />
- <link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
- <script type="text/javascript" id="documentation_options" data-url_root="../../" src="../../_static/documentation_options.js"></script>
- <script type="text/javascript" src="../../_static/jquery.js"></script>
- <script type="text/javascript" src="../../_static/underscore.js"></script>
- <script type="text/javascript" src="../../_static/doctools.js"></script>
- <script type="text/javascript" src="../../_static/language_data.js"></script>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>ImageMetaTag.db &#8212; ImageMetaTag 0.7.11 documentation</title>
+ <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
+ <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css" />
+ <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
+ <script src="../../_static/jquery.js"></script>
+ <script src="../../_static/underscore.js"></script>
+ <script src="../../_static/doctools.js"></script>
  <link rel="index" title="Index" href="../../genindex.html" />
  <link rel="search" title="Search" href="../../search.html" /> 
  </head><body>
@@ -26,29 +24,11 @@ <h3>Navigation</h3>
  <li class="right" >
  <a href="../../py-modindex.html" title="Python Module Index"
  >modules</a> |</li>
- <li class="nav-item nav-item-0"><a href="../../index.html">ImageMetaTag 0.7.10 documentation</a> &#187;</li>
- <li class="nav-item nav-item-1"><a href="../index.html" accesskey="U">Module code</a> &#187;</li> 
+ <li class="nav-item nav-item-0"><a href="../../index.html">ImageMetaTag 0.7.11 documentation</a> &#187;</li>
+ <li class="nav-item nav-item-1"><a href="../index.html" accesskey="U">Module code</a> &#187;</li>
+ <li class="nav-item nav-item-this"><a href="">ImageMetaTag.db</a></li> 
  </ul>
- </div>
- <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
- <div class="sphinxsidebarwrapper">
- <p class="logo"><a href="../../index.html">
- <img class="logo" src="../../_static/logo.png" alt="Logo"/>
- </a></p>
-<div id="searchbox" style="display: none" role="search">
- <h3>Quick search</h3>
- <div class="searchformwrapper">
- <form class="search" action="../../search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- </div>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
+ </div> 
 
  <div class="document">
  <div class="documentwrapper">
@@ -75,15 +55,15 @@ <h1>Source code for ImageMetaTag.db</h1><div class="highlight"><pre>
 <span class="kn">import</span> <span class="nn">errno</span>
 <span class="kn">import</span> <span class="nn">pdb</span>
 
-<span class="kn">from</span> <span class="nn">datetime</span> <span class="k">import</span> <span class="n">datetime</span>
-<span class="kn">from</span> <span class="nn">io</span> <span class="k">import</span> <span class="n">StringIO</span>
+<span class="kn">from</span> <span class="nn">datetime</span> <span class="kn">import</span> <span class="n">datetime</span>
+<span class="kn">from</span> <span class="nn">io</span> <span class="kn">import</span> <span class="n">StringIO</span>
 <span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
 
-<span class="kn">from</span> <span class="nn">ImageMetaTag</span> <span class="k">import</span> <span class="n">META_IMG_FORMATS</span>
-<span class="kn">from</span> <span class="nn">ImageMetaTag</span> <span class="k">import</span> <span class="n">DEFAULT_DB_TIMEOUT</span>
-<span class="kn">from</span> <span class="nn">ImageMetaTag</span> <span class="k">import</span> <span class="n">DEFAULT_DB_ATTEMPTS</span>
-<span class="kn">from</span> <span class="nn">ImageMetaTag.img_dict</span> <span class="k">import</span> <span class="n">readmeta_from_image</span>
-<span class="kn">from</span> <span class="nn">ImageMetaTag.img_dict</span> <span class="k">import</span> <span class="n">check_for_required_keys</span>
+<span class="kn">from</span> <span class="nn">ImageMetaTag</span> <span class="kn">import</span> <span class="n">META_IMG_FORMATS</span>
+<span class="kn">from</span> <span class="nn">ImageMetaTag</span> <span class="kn">import</span> <span class="n">DEFAULT_DB_TIMEOUT</span>
+<span class="kn">from</span> <span class="nn">ImageMetaTag</span> <span class="kn">import</span> <span class="n">DEFAULT_DB_ATTEMPTS</span>
+<span class="kn">from</span> <span class="nn">ImageMetaTag.img_dict</span> <span class="kn">import</span> <span class="n">readmeta_from_image</span>
+<span class="kn">from</span> <span class="nn">ImageMetaTag.img_dict</span> <span class="kn">import</span> <span class="n">check_for_required_keys</span>
 
 <span class="c1"># the name of the database table that holds the plot metadata</span>
 <span class="n">SQLITE_IMG_INFO_TABLE</span> <span class="o">=</span> <span class="s1">&#39;img_info&#39;</span>
@@ -1042,9 +1022,27 @@ <h1>Source code for ImageMetaTag.db</h1><div class="highlight"><pre>
  <span class="k">return</span> <span class="n">datetime</span><span class="o">.</span><span class="n">now</span><span class="p">()</span><span class="o">.</span><span class="n">strftime</span><span class="p">(</span><span class="s1">&#39;%Y-%m-</span><span class="si">%d</span><span class="s1"> %H:%M:%S&#39;</span><span class="p">)</span>
 </pre></div>
 
+ <div class="clearer"></div>
  </div>
  </div>
  </div>
+ <div class="sphinxsidebar" role="navigation" aria-label="main navigation">
+ <div class="sphinxsidebarwrapper">
+ <p class="logo"><a href="../../index.html">
+ <img class="logo" src="../../_static/logo.png" alt="Logo"/>
+ </a></p>
+<div id="searchbox" style="display: none" role="search">
+ <h3 id="searchlabel">Quick search</h3>
+ <div class="searchformwrapper">
+ <form class="search" action="../../search.html" method="get">
+ <input type="text" name="q" aria-labelledby="searchlabel" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
+ <input type="submit" value="Go" />
+ </form>
+ </div>
+</div>
+<script>$('#searchbox').show(0);</script>
+ </div>
+ </div>
  <div class="clearer"></div>
  </div>
  <div class="related" role="navigation" aria-label="related navigation">
@@ -1056,13 +1054,14 @@ <h3>Navigation</h3>
  <li class="right" >
  <a href="../../py-modindex.html" title="Python Module Index"
  >modules</a> |</li>
- <li class="nav-item nav-item-0"><a href="../../index.html">ImageMetaTag 0.7.10 documentation</a> &#187;</li>
- <li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li> 
+ <li class="nav-item nav-item-0"><a href="../../index.html">ImageMetaTag 0.7.11 documentation</a> &#187;</li>
+ <li class="nav-item nav-item-1"><a href="../index.html" >Module code</a> &#187;</li>
+ <li class="nav-item nav-item-this"><a href="">ImageMetaTag.db</a></li> 
  </ul>
  </div>
  <div class="footer" role="contentinfo">
- &#169; Copyright 2015-2020, British Crown Copyright.
- Created using <a href="http:https://sphinx-doc.org/">Sphinx</a> 1.8.5.
+ &#169; Copyright 2015-2022, British Crown Copyright.
+ Created using <a href="https:https://www.sphinx-doc.org/">Sphinx</a> 4.4.0.
  </div>
  </body>
 </html>