[med-svn] [python-schema-salad] 07/09: Merge tag 'upstream/2.2.20170111180227'

[Michael Crusoe]

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

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

commit 58f5404f1bd7796b79523f716af56f4fab0d4b8b
Merge: 4915ed3 f5d6df0
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Thu Jan 12 00:16:40 2017 -0800

    Merge tag 'upstream/2.2.20170111180227'
    
    Upstream version 2.2.20170111180227

 MANIFEST.in                                        |   5 +-
 PKG-INFO                                           |   6 +-
 README.rst                                         |   4 +-
 schema_salad.egg-info/PKG-INFO                     |   6 +-
 schema_salad.egg-info/SOURCES.txt                  |  31 +-
 schema_salad.egg-info/pbr.json                     |   2 +-
 schema_salad.egg-info/requires.txt                 |   3 +-
 schema_salad/add_dictlist.py                       |   1 +
 schema_salad/aslist.py                             |   1 +
 schema_salad/flatten.py                            |   2 +
 schema_salad/jsonld_context.py                     |  42 +-
 schema_salad/main.py                               |  43 +-
 schema_salad/makedoc.py                            |  26 +-
 schema_salad/ref_resolver.py                       | 433 ++++++----
 schema_salad/schema.py                             | 136 +++-
 schema_salad/sourceline.py                         | 165 ++++
 schema_salad/tests/.coverage                       |   1 +
 schema_salad/tests/frag.yml                        |   4 +
 schema_salad/tests/test_errors.py                  |  31 +
 schema_salad/tests/test_errors.py~                 |   1 +
 schema_salad/tests/test_examples.py                |  92 ++-
 schema_salad/tests/test_fetch.py~                  |  13 +
 schema_salad/tests/test_schema/CommandLineTool.yml | 894 +++++++++++++++++++++
 .../tests/test_schema/CommonWorkflowLanguage.yml   |  11 +
 schema_salad/tests/test_schema/Process.yml         | 743 +++++++++++++++++
 schema_salad/tests/test_schema/Workflow.yml        | 582 ++++++++++++++
 schema_salad/tests/test_schema/concepts.md         |   1 +
 schema_salad/tests/test_schema/contrib.md          |   1 +
 schema_salad/tests/test_schema/intro.md            |   1 +
 schema_salad/tests/test_schema/invocation.md       |   1 +
 schema_salad/tests/test_schema/metaschema_base.yml | 164 ++++
 schema_salad/tests/test_schema/test1.cwl           |   1 +
 schema_salad/tests/test_schema/test10.cwl          |  10 +
 schema_salad/tests/test_schema/test11.cwl          |  10 +
 schema_salad/tests/test_schema/test2.cwl           |   1 +
 schema_salad/tests/test_schema/test3.cwl           |   6 +
 schema_salad/tests/test_schema/test4.cwl           |   6 +
 schema_salad/tests/test_schema/test5.cwl           |   6 +
 schema_salad/tests/test_schema/test6.cwl           |   5 +
 schema_salad/tests/test_schema/test7.cwl           |  10 +
 schema_salad/tests/test_schema/test8.cwl           |  10 +
 schema_salad/tests/test_schema/test9.cwl           |  10 +
 schema_salad/tests/test_validate.pyx               |  71 ++
 schema_salad/tests/test_validate.py~               |  70 ++
 schema_salad/tests/util.py                         |  13 +
 schema_salad/validate.py                           | 147 ++--
 setup.cfg                                          |   2 +-
 setup.py                                           |   5 +-
 48 files changed, 3483 insertions(+), 346 deletions(-)

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