Michael R. Crusoe pushed to branch master at Debian Med / python-schema-salad
Commits: 017b186f by Michael R. Crusoe at 2020-02-27T19:46:55+01:00 New upstream version 5.0.20200220195218 - - - - - 6a657d95 by Michael R. Crusoe at 2020-02-27T19:46:55+01:00 routine-update: New upstream version - - - - - 929200ff by Michael R. Crusoe at 2020-02-27T19:46:57+01:00 Update upstream source from tag 'upstream/5.0.20200220195218' Update to upstream version '5.0.20200220195218' with Debian dir 89a614f51a9054ac052eff630eb4709ebc2882d1 - - - - - 29a648c4 by Michael R. Crusoe at 2020-02-27T19:46:57+01:00 routine-update: Standards-Version: 4.5.0 - - - - - eba5ee92 by Michael R. Crusoe at 2020-02-27T19:47:03+01:00 Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse. Fixes: lintian: upstream-metadata-file-is-missing See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html - - - - - 4495ad25 by Michael R. Crusoe at 2020-02-27T19:57:25+01:00 5.0.20200220195218-1 - - - - - 11 changed files: - Makefile - PKG-INFO - debian/changelog - debian/control - + debian/upstream/metadata - schema_salad.egg-info/PKG-INFO - schema_salad.egg-info/SOURCES.txt - schema_salad/avro/schema.py - schema_salad/tests/test_examples.py - + schema_salad/tests/test_schema/cwltest-schema.yml - setup.cfg Changes: ===================================== Makefile ===================================== @@ -192,7 +192,7 @@ release-test: FORCE release: release-test . testenv3_2/bin/activate && \ testenv3_2/src/${PACKAGE}/setup.py sdist bdist_wheel - . testenv3.7_2/bin/activate && \ + . testenv3_2/bin/activate && \ pip install twine && \ twine upload testenv3_2/src/${PACKAGE}/dist/* && \ git tag ${VERSION} && git push --tags ===================================== PKG-INFO ===================================== @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: schema-salad -Version: 5.0.20200126033820 +Version: 5.0.20200220195218 Summary: Schema Annotations for Linked Avro Data (SALAD) Home-page: https://github.com/common-workflow-language/schema_salad Author: Common workflow language working group ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +python-schema-salad (5.0.20200220195218-1) unstable; urgency=medium + + * New upstream version + * Standards-Version: 4.5.0 (routine-update) + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + -- Michael R. Crusoe <[email protected]> Thu, 27 Feb 2020 19:57:12 +0100 + python-schema-salad (5.0.20200126033820-2) unstable; urgency=medium * Allow for newer versions of CacheControl. ===================================== debian/control ===================================== @@ -21,7 +21,7 @@ Build-Depends: debhelper-compat (= 12), python3-pytest-xdist, python3-pytest-runner, help2man -Standards-Version: 4.4.5 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/med-team/python-schema-salad Vcs-Git: https://salsa.debian.org/med-team/python-schema-salad.git Homepage: https://www.commonwl.org ===================================== debian/upstream/metadata ===================================== @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/common-workflow-language/schema_salad/issues +Bug-Submit: https://github.com/common-workflow-language/schema_salad/issues/new +Repository: https://github.com/common-workflow-language/schema_salad.git +Repository-Browse: https://github.com/common-workflow-language/schema_salad ===================================== schema_salad.egg-info/PKG-INFO ===================================== @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: schema-salad -Version: 5.0.20200126033820 +Version: 5.0.20200220195218 Summary: Schema Annotations for Linked Avro Data (SALAD) Home-page: https://github.com/common-workflow-language/schema_salad Author: Common workflow language working group ===================================== schema_salad.egg-info/SOURCES.txt ===================================== @@ -160,6 +160,7 @@ schema_salad/tests/test_schema/Process.yml schema_salad/tests/test_schema/Workflow.yml schema_salad/tests/test_schema/concepts.md schema_salad/tests/test_schema/contrib.md +schema_salad/tests/test_schema/cwltest-schema.yml schema_salad/tests/test_schema/intro.md schema_salad/tests/test_schema/invocation.md schema_salad/tests/test_schema/metaschema_base.yml ===================================== schema_salad/avro/schema.py ===================================== @@ -556,6 +556,11 @@ def make_avsc_object(json_data, names=None): names = Names() assert isinstance(names, Names) + if isinstance(json_data, Dict) and json_data.get("name") == "Any": + del names.names["Any"] + elif not names.has_name("Any", ""): + EnumSchema("Any", "", ["Any"], names=names) + # JSON object (non-union) if hasattr(json_data, "get") and callable(json_data.get): # type: ignore assert isinstance(json_data, Dict) ===================================== schema_salad/tests/test_examples.py ===================================== @@ -415,3 +415,15 @@ def test_blank_node_id(): ra, _ = ldr.resolve_all(cmap({"id": "_:foo"}), "http://example.com";) assert {"id": "_:foo"} == ra + + +def test_can_use_Any(): + # Test that 'type: Any' can be used + ( + document_loader, + avsc_names, + schema_metadata, + metaschema_loader, + ) = schema_salad.schema.load_schema( # noqa: B950 + get_data("tests/test_schema/cwltest-schema.yml") + ) ===================================== schema_salad/tests/test_schema/cwltest-schema.yml ===================================== @@ -0,0 +1,25 @@ +$base: "https://w3id.org/cwl/cwltest#"; +$graph: + - name: TestCase + type: record + documentRoot: true + fields: + id: + type: [int, string] + jsonldPredicate: + _type: "@id" + identity: true + label: string? + doc: string? + tags: string[]? + tool: + type: string + jsonldPredicate: + _type: "@id" + job: + type: string? + jsonldPredicate: + _type: "@id" + should_fail: boolean? + output: + type: Any? ===================================== setup.cfg ===================================== @@ -5,6 +5,6 @@ test = pytest addopts = --pyargs schema_salad [egg_info] -tag_build = .20200126033820 +tag_build = .20200220195218 tag_date = 0 View it on GitLab: https://salsa.debian.org/med-team/python-schema-salad/-/compare/f3c49449acad7952adbe9fbc4946916461718331...4495ad25392bd9279a4fb545cfeee0024c8fc8bc -- View it on GitLab: https://salsa.debian.org/med-team/python-schema-salad/-/compare/f3c49449acad7952adbe9fbc4946916461718331...4495ad25392bd9279a4fb545cfeee0024c8fc8bc You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
