Commit 86636f0e authored by Michael R. Crusoe's avatar Michael R. Crusoe 🏳️‍🌈
Browse files

New upstream version 3.0.20181206233650

parent 42ce5a3a

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ PACKAGE=schema-salad 
# `SHELL=bash` doesn't work for some, so don't use BASH-isms like

# `[[` conditional expressions.

PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py

DEVPKGS=pycodestyle diff_cover autopep8 pylint coverage pep257 pytest flake8

DEVPKGS=pycodestyle diff_cover autopep8 pylint coverage pep257 pytest-xdist flake8

COVBASE=coverage run --branch --append --source=${MODULE} \

	--omit=schema_salad/tests/*
@@ -109,11 +109,11 @@ format: autopep8 
## pylint      : run static code analysis on Python code

pylint: $(PYSOURCES)

	pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \

                $^ -j$(nproc)|| true

                $^ -j0|| true



pylint_report.txt: ${PYSOURCES}

	pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \

		$^ -j$(nproc)> $@ || true

		$^ -j0> $@ || true



diff_pylint_report: pylint_report.txt

	diff-quality --violations=pylint pylint_report.txt
@@ -166,7 +166,7 @@ diff-cover.html: coverage.xml 


## test        : run the ${MODULE} test suite

test: FORCE

	python setup.py test

	python setup.py test --addopts "-n auto"



sloccount.sc: ${PYSOURCES} Makefile

	sloccount --duplicates --wide --details $^ > $@

PKG-INFO

+1 −1
Original line number Diff line number Diff line 
Metadata-Version: 1.1

Name: schema-salad

Version: 3.0.20181129082112

Version: 3.0.20181206233650

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/PKG-INFO

+1 −1
Original line number Diff line number Diff line 
Metadata-Version: 1.1

Name: schema-salad

Version: 3.0.20181129082112

Version: 3.0.20181206233650

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

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ schema_salad/tests/EDAM.owl 
schema_salad/tests/Process.yml

schema_salad/tests/__init__.py

schema_salad/tests/bad_schema.yml

schema_salad/tests/bad_schema2.yml

schema_salad/tests/cwl-pre.yml

schema_salad/tests/frag.yml

schema_salad/tests/hello.txt

schema_salad/avro/schema.py

+1 −17
Original line number Diff line number Diff line
@@ -122,10 +122,6 @@ class Schema(object): 
    # creates JSON properties directly from this dict.

    props = property(lambda self: self._props)



    # Read-only property dict. Non-reserved properties

    other_props = property(lambda self: get_other_props(self._props, SCHEMA_RESERVED_PROPS),

                           doc="dictionary of non-reserved properties")



    # utility functions to manipulate properties dict

    def get_prop(self, key):

        return self._props.get(key)
@@ -272,8 +268,6 @@ class NamedSchema(Schema): 


    # read-only properties

    name = property(lambda self: self.get_prop('name'))

    namespace = property(lambda self: self.get_prop('namespace'))

    fullname = property(lambda self: self._fullname)



class Field(object):

    def __init__(self,
@@ -326,14 +320,6 @@ class Field(object): 


    # read-only properties

    default = property(lambda self: self.get_prop('default'))

    has_default = property(lambda self: self._has_default)

    order = property(lambda self: self.get_prop('order'))

    doc = property(lambda self: self.get_prop('doc'))

    props = property(lambda self: self._props)



    # Read-only property dict. Non-reserved properties

    other_props = property(lambda self: get_other_props(self._props, FIELD_RESERVED_PROPS),

                           doc="dictionary of non-reserved properties")



    # utility functions to manipulate properties dict

    def get_prop(self, key):
@@ -386,7 +372,6 @@ class EnumSchema(NamedSchema): 


    # read-only properties

    symbols = property(lambda self: self.get_prop('symbols'))

    doc = property(lambda self: self.get_prop('doc'))



#

# Complex Types (recursive)
@@ -523,7 +508,6 @@ class RecordSchema(NamedSchema): 


    # read-only properties

    fields = property(lambda self: self.get_prop('fields'))

    doc = property(lambda self: self.get_prop('doc'))



#

# Module Methods