Skip to content

Commit

Permalink
Merge pull request #80 from SciTools-incubator/add_pako_for_conda
Browse files Browse the repository at this point in the history
Added the pako_inflate.js file to the repository.
  • Loading branch information
Malcolm Brooks authored Oct 13, 2017
2 parents 30f957e + cc89627 commit 21dd91a
Show file tree
Hide file tree
Showing 57 changed files with 4,699 additions and 14,252 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
.pydevproject
*.pyc
*~
ImageMetaTag/javascript/pako_inflate.js
8 changes: 2 additions & 6 deletions ImageMetaTag/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,8 @@
Released under BSD 3-Clause License. See LICENSE for more details.
'''

__version__ = '0.6.6'
# for consistency, the version here should match:
# ImageMetaTag/__init__.py
# ImageMetaTag/javascript/imt_dropdown.js
# docs/source/conf.py
# setup.py
# see release_process for details on incrementing the version
__version__ = '0.6.7',
__documentation__ = 'http://scitools-incubator.github.io/image-meta-tag/build/html/'

# list fo file formats which are valid for saving metadata to:
Expand Down
3 changes: 3 additions & 0 deletions ImageMetaTag/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
In normal usage it is primarily used by :func:`ImageMetaTag.savefig` to create the database
as figures are saved. Once the metadata database has been built up then the metadata can be
loaded with :func:`ImageMetaTag.db.read`.
(C) Crown copyright Met Office. All rights reserved.
Released under BSD 3-Clause License. See LICENSE for more details.
'''

import os, sqlite3, fnmatch, time, errno, pdb
Expand Down
3 changes: 3 additions & 0 deletions ImageMetaTag/img_dict.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
`simplest_image_dict.py <simple.html>`_
.. moduleauthor:: Malcolm Brooks https://github.com/malcolmbrooks
(C) Crown copyright Met Office. All rights reserved.
Released under BSD 3-Clause License. See LICENSE for more details.
'''
# required imports
import os, re, collections, inspect, copy
Expand Down
4 changes: 2 additions & 2 deletions ImageMetaTag/javascript/imt_dropdown.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// ImageMetaTag dropdown menu scripting - vn0.6.6
// ImageMetaTag dropdown menu scripting - vn0.6.7
// 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.
//
// (C) Crown copyright Met Office. All rights reserved.
// Released under BSD 3-Clause License.
// Released under BSD 3-Clause License. See LICENSE for more details.

function read_parse_json_files(json_files, zlib_comp){
// reads a list of files that contain the json
Expand Down
Loading

0 comments on commit 21dd91a

Please sign in to comment.