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

New upstream version 5.0.20200122085940

parent ec160bbf
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
include gittaggers.py Makefile LICENSE.txt requirements.txt
include schema_salad/py.typed
include schema_salad/avro/*
recursive-include schema_salad/java *
include schema_salad/tests/*
include schema_salad/tests/test_schema/*.md
include schema_salad/tests/test_schema/*.yml
+11 −23
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ COVBASE=coverage run --branch --append --source=${MODULE} \

# Updating the Major & Minor version below?
# Don't forget to update setup.py as well
VERSION=4.5.$(shell date +%Y%m%d%H%M%S --utc --date=`git log --first-parent \
VERSION=5.0.$(shell date +%Y%m%d%H%M%S --utc --date=`git log --first-parent \
	--max-count=1 --format=format:%cI`)

## all         : default task
@@ -86,7 +86,7 @@ diff_pydocstyle_report: pydocstyle_report.txt

## format      : check/fix all code indentation and formatting (runs black)
format:
	black --target-version py27 schema_salad
	black --exclude metaschema.py schema_salad

## pylint      : run static code analysis on Python code
pylint: $(PYSOURCES)
@@ -161,22 +161,12 @@ list-author-emails:
	@echo 'name, E-Mail Address'
	@git log --format='%aN,%aE' | sort -u | grep -v 'root'

mypy2: ${PYSOURCES}
	if ! test -f $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))')/py.typed ; \
mypy3: mypy
mypy: ${PYSOURCES}
	if ! test -f $(shell python3 -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))')/py.typed ; \
	then \
		rm -Rf typeshed/2and3/ruamel/yaml ; \
		ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
			typeshed/2and3/ruamel/ ; \
	fi  # if minimally required ruamel.yaml version is 0.15.99 or greater, than the above can be removed
	MYPYPATH=$$MYPYPATH:typeshed/2.7:typeshed/2and3 mypy --py2 --disallow-untyped-calls \
		 --warn-redundant-casts \
		 schema_salad

mypy3: ${PYSOURCES}
	if ! test -f $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))')/py.typed ; \
	then \
		rm -Rf typeshed/2and3/ruamel/yaml ; \
		ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
		ln -s $(shell python3 -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
			typeshed/2and3/ruamel/ ; \
	fi  # if minimally required ruamel.yaml version is 0.15.99 or greater, than the above can be removed
	MYPYPATH=$$MYPYPATH:typeshed/3:typeshed/2and3 mypy --disallow-untyped-calls \
@@ -193,20 +183,18 @@ jenkins: FORCE
	. env3/bin/activate ; \
	pip install -U setuptools pip wheel ; \
	${MAKE} install-dep ; \
	pip install -U -r mypy_requirements.txt ; ${MAKE} mypy2
	# pip install -U -r mypy_requirements.txt ; ${MAKE} mypy3
	pip install -U -r mypy_requirements.txt ; ${MAKE} mypy

release-test: FORCE
	git diff-index --quiet HEAD -- || ( echo You have uncommited changes, please commit them and try again; false )
	PYVER=2.7 ./release-test.sh
	PYVER=3 ./release-test.sh

release: release-test
	. testenv2.7_2/bin/activate && \
		testenv2.7_2/src/${PACKAGE}/setup.py sdist bdist_wheel
	. testenv2.7_2/bin/activate && \
	. testenv3_2/bin/activate && \
		testenv3_2/src/${PACKAGE}/setup.py sdist bdist_wheel
	. testenv3.7_2/bin/activate && \
		pip install twine && \
		twine upload testenv2.7_2/src/${PACKAGE}/dist/* && \
		twine upload testenv3_2/src/${PACKAGE}/dist/* && \
		git tag ${VERSION} && git push --tags

FORCE:
+8 −4
Original line number Diff line number Diff line
Metadata-Version: 1.1
Metadata-Version: 2.1
Name: schema-salad
Version: 4.5.20190815125611
Version: 5.0.20200122085940
Summary: Schema Annotations for Linked Avro Data (SALAD)
Home-page: https://github.com/common-workflow-language/schema_salad
Author: Common workflow language working group
@@ -31,6 +31,8 @@ Description: |Linux Build Status| |Windows Build status| |Code coverage| |CII Be
        between document and record oriented data modeling and the Semantic
        Web.
        
        The Schema Salad library is Python 3.5+ only.
        
        Usage
        -----
        
@@ -42,7 +44,7 @@ Description: |Linux Build Status| |Windows Build status| |Code coverage| |CII Be
        
          git clone https://github.com/common-workflow-language/schema_salad
          cd schema_salad
          python setup.py install
          python3 setup.py install
        
        Commands
        --------
@@ -230,9 +232,11 @@ Classifier: Operating System :: POSIX
Classifier: Operating System :: MacOS :: MacOS X
Classifier: Operating System :: Microsoft :: Windows
Classifier: Development Status :: 5 - Production/Stable
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python :: 3.8
Classifier: Typing :: Typed
Requires-Python: >=3.5
Description-Content-Type: text/x-rst
Provides-Extra: docs
+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ generation, and transformation to RDF_. Salad provides a bridge
between document and record oriented data modeling and the Semantic
Web.

The Schema Salad library is Python 3.5+ only.

Usage
-----

@@ -33,7 +35,7 @@ To install from source::

  git clone https://github.com/common-workflow-language/schema_salad
  cd schema_salad
  python setup.py install
  python3 setup.py install

Commands
--------
+1 −0
Original line number Diff line number Diff line
import subprocess
import time

import pkg_resources
from setuptools.command.egg_info import egg_info

Loading