[med-svn] [python-schema-salad] 03/07: Merge tag 'upstream/1.21.20161206204028'

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository python-schema-salad.

commit 9f61cbd1b946a309cacdd5f8e1a187813287683d
Merge: 4a38ed9 bd36ec8
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 9 22:09:16 2016 +0100

    Merge tag 'upstream/1.21.20161206204028'
    
    Upstream version 1.21.20161206204028

 MANIFEST.in                                        |     4 +
 Makefile                                           |   192 +
 PKG-INFO                                           |    10 +-
 README.rst                                         |     2 +-
 gittaggers.py                                      |    23 +
 schema_salad.egg-info/PKG-INFO                     |    10 +-
 schema_salad.egg-info/SOURCES.txt                  |    16 +-
 schema_salad.egg-info/pbr.json                     |     2 +-
 schema_salad.egg-info/requires.txt                 |    15 +-
 schema_salad/__init__.py                           |     2 +
 schema_salad/__main__.py                           |     3 +-
 schema_salad/add_dictlist.py                       |     7 +
 schema_salad/aslist.py                             |     5 +-
 schema_salad/flatten.py                            |     4 +
 schema_salad/jsonld_context.py                     |   139 +-
 schema_salad/main.py                               |   160 +-
 schema_salad/makedoc.py                            |   192 +-
 schema_salad/metaschema/import_include.md          |    64 +
 schema_salad/metaschema/metaschema.yml             |   270 +-
 .../metaschema/{metaschema.yml => metaschema2.yml} |   274 +-
 .../{metaschema.yml => metaschema2.yml~}           |   273 +-
 schema_salad/metaschema/metaschema_base.yml        |   164 +
 schema_salad/ref_resolver.py                       |   792 +-
 schema_salad/schema.py                             |   290 +-
 schema_salad/tests/EDAM.owl                        | 51294 +++++++++++++++++++
 schema_salad/tests/Process.yml                     |    36 +
 schema_salad/tests/__init__.py                     |     0
 schema_salad/tests/mixin.yml                       |     2 +
 schema_salad/tests/test_examples.py                |   369 +
 schema_salad/tests/test_fetch.py                   |    57 +
 schema_salad/validate.py                           |   210 +-
 setup.cfg                                          |    14 +-
 setup.py                                           |    66 +-
 33 files changed, 53786 insertions(+), 1175 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-schema-salad.git