Skip to content

Commit cc78562

Browse files
author
Peter Amstutz
committed
Merge schema salad commit '7ea7dcf92e5782c4aca844f1e98d2d9550e07aae' into v1.0-errata
2 parents 4e24494 + 7ea7dcf commit cc78562

File tree

134 files changed

+5333
-2661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+5333
-2661
lines changed

‎v1.0/salad/.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,11 @@
22
.eggs
33
*.egg-info/
44
*pyc
5+
6+
build/
7+
dist/
8+
ruamel
9+
typeshed/2and3/ruamel/yaml
10+
# virtualenv
11+
venv/
12+
.cache/

‎v1.0/salad/.travis.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1+
sudo: false
12
language: python
2-
python: 2.7
3+
python:
4+
- 2.7
5+
- 3.3
6+
- 3.4
7+
- 3.5
8+
- 3.6
39
os:
410
- linux
5-
env:
6-
- TOX_ENV=py27-lint
7-
- TOX_ENV=py27-unit
8-
- TOX_ENV=py34-mypy
9-
# - TOX_ENV=py34-lint
10-
# - TOX_ENV=py33-lint
11-
# - TOX_ENV=py34-unit
12-
# - TOX_ENV=py33-unit
1311

1412
install:
15-
- pip install tox
16-
17-
script: tox -e $TOX_ENV
18-
13+
- pip install tox-travis
14+
script: tox
1915
notifications:
2016
email: false

‎v1.0/salad/MANIFEST.in‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
include gittaggers.py ez_setup.py
1+
include gittaggers.py Makefile
2+
include schema_salad/tests/*
3+
include schema_salad/tests/test_schema/*.md
4+
include schema_salad/tests/test_schema/*.yml
5+
include schema_salad/tests/test_schema/*.cwl
6+
include schema_salad/metaschema/*
7+
global-exclude *~
8+
global-exclude *.pyc

‎v1.0/salad/Makefile‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ MODULE=schema_salad
2626
# `SHELL=bash` Will break Titus's laptop, so don't use BASH-isms like
2727
# `[[` conditional expressions.
2828
PYSOURCES=$(wildcard ${MODULE}/**.py tests/*.py) setup.py
29-
DEVPKGS=pep8 diff_cover autopep8 pylint coverage pep257
29+
DEVPKGS=pep8 diff_cover autopep8 pylint coverage pep257 pytest flake8
30+
COVBASE=coverage run --branch --append --source=${MODULE} \
31+
--omit=schema_salad/tests/*
3032

3133
VERSION=$(shell git describe --tags --dirty | sed s/v//)
3234

@@ -46,7 +48,7 @@ install-dependencies:
4648

4749
## install : install the ${MODULE} module and schema-salad-tool
4850
install: FORCE
49-
./setup.py build install
51+
pip install .
5052

5153
## dist : create a module package for distribution
5254
dist: dist/${MODULE}-$(VERSION).tar.gz
@@ -103,37 +105,31 @@ diff_pylint_report: pylint_report.txt
103105
diff-quality --violations=pylint pylint_report.txt
104106

105107
.coverage: $(PYSOURCES)
106-
coverage run --branch --source=${MODULE} setup.py test
107-
coverage run --append --branch --source=${MODULE} \
108-
-m schema_salad.main \
108+
rm -f .coverage
109+
$(COVBASE) setup.py test
110+
$(COVBASE) -m schema_salad.main \
109111
--print-jsonld-context schema_salad/metaschema/metaschema.yml \
110112
> /dev/null
111-
coverage run --append --branch --source=${MODULE} \
112-
-m schema_salad.main \
113+
$(COVBASE) -m schema_salad.main \
113114
--print-rdfs schema_salad/metaschema/metaschema.yml \
114115
> /dev/null
115-
coverage run --append --branch --source=${MODULE} \
116-
-m schema_salad.main \
116+
$(COVBASE) -m schema_salad.main \
117117
--print-avro schema_salad/metaschema/metaschema.yml \
118118
> /dev/null
119-
coverage run --append --branch --source=${MODULE} \
120-
-m schema_salad.main \
119+
$(COVBASE) -m schema_salad.main \
121120
--print-rdf schema_salad/metaschema/metaschema.yml \
122121
> /dev/null
123-
coverage run --append --branch --source=${MODULE} \
124-
-m schema_salad.main \
122+
$(COVBASE) -m schema_salad.main \
125123
--print-pre schema_salad/metaschema/metaschema.yml \
126124
> /dev/null
127-
coverage run --append --branch --source=${MODULE} \
128-
-m schema_salad.main \
125+
$(COVBASE) -m schema_salad.main \
129126
--print-index schema_salad/metaschema/metaschema.yml \
130127
> /dev/null
131-
coverage run --append --branch --source=${MODULE} \
132-
-m schema_salad.main \
128+
$(COVBASE) -m schema_salad.main \
133129
--print-metadata schema_salad/metaschema/metaschema.yml \
134130
> /dev/null
135-
coverage run --append --branch --source=${MODULE} \
136-
-m schema_salad.makedoc schema_salad/metaschema/metaschema.yml \
131+
$(COVBASE) -m schema_salad.makedoc \
132+
schema_salad/metaschema/metaschema.yml \
137133
> /dev/null
138134

139135
coverage.xml: .coverage
@@ -169,17 +165,33 @@ list-author-emails:
169165
@echo 'name, E-Mail Address'
170166
@git log --format='%aN,%aE' | sort -u | grep -v 'root'
171167

172-
mypy: ${PYSOURCES}
173-
MYPYPATH=typeshed/2.7 mypy --py2 --disallow-untyped-calls schema_salad
168+
mypy2: ${PYSOURCES}
169+
rm -Rf typeshed/2and3/ruamel/yaml
170+
ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
171+
typeshed/2and3/ruamel/
172+
MYPYPATH=$MYPYPATH:typeshed/2.7:typeshed/2and3 mypy --py2 --disallow-untyped-calls \
173+
--warn-redundant-casts \
174+
schema_salad
175+
176+
mypy3: ${PYSOURCES}
177+
rm -Rf typeshed/2and3/ruamel/yaml
178+
ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
179+
typeshed/2and3/ruamel/
180+
MYPYPATH=$MYPYPATH:typeshed/3:typeshed/2and3 mypy --disallow-untyped-calls \
181+
--warn-redundant-casts \
182+
schema_salad
174183

175184
jenkins:
176-
if ! test -d env ; then virtualenv env ; fi
185+
rm -Rf env && virtualenv env
177186
. env/bin/activate ; \
178187
pip install -U setuptools pip wheel ; \
179188
${MAKE} install-dep coverage.html coverage.xml pep257_report.txt \
180189
sloccount.sc pep8_report.txt pylint_report.txt
181190
if ! test -d env3 ; then virtualenv -p python3 env3 ; fi
182191
. env3/bin/activate ; \
183-
pip install -U mypy-lang; ${MAKE} mypy
192+
pip install -U setuptools pip wheel ; \
193+
${MAKE} install-dep ; \
194+
pip install -U -r mypy_requirements.txt ; ${MAKE} mypy2
195+
# pip install -U -r mypy_requirements.txt ; ${MAKE} mypy3
184196

185197
FORCE:

‎v1.0/salad/README.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ Usage
2727
$ python
2828
>>> import schema_salad
2929

30+
To install from source::
31+
32+
git clone https://github.com/common-workflow-language/schema_salad
33+
cd schema_salad
34+
python setup.py install
35+
36+
3037
Documentation
3138
-------------
3239

‎v1.0/salad/mypy.ini‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[mypy-ruamel.*]
2+
ignore_errors = True

‎v1.0/salad/mypy_requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mypy==0.511 ; python_version>="3"

‎v1.0/salad/release-test.sh‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#!/bin/bash
2+
3+
set -e
4+
set -x
5+
6+
package=schema-salad
7+
module=schema_salad
8+
repo=https://github.com/common-workflow-language/schema_salad.git
9+
run_tests="py.test --pyarg ${module}"
10+
pipver=8.0.1 # minimum required version of pip
11+
setupver=20.10.1 # minimum required version of setuptools
12+
13+
rm -Rf testenv? || /bin/true
14+
15+
export HEAD=`git rev-parse HEAD`
16+
virtualenv testenv1
17+
virtualenv testenv2
18+
virtualenv testenv3
19+
virtualenv testenv4
20+
21+
# First we test the head
22+
source testenv1/bin/activate
23+
rm testenv1/lib/python-wheels/setuptools* \
24+
&& pip install --force-reinstall -U pip==${pipver} \
25+
&& pip install setuptools==${setupver} wheel
26+
make install-dependencies
27+
make test
28+
pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
29+
mkdir testenv1/not-${module}
30+
# if there is a subdir named '${module}' py.test will execute tests
31+
# there instead of the installed module's tests
32+
pushd testenv1/not-${module}; ../bin/${run_tests}; popd
33+
34+
35+
# Secondly we test via pip
36+
37+
cd testenv2
38+
source bin/activate
39+
rm lib/python-wheels/setuptools* \
40+
&& pip install --force-reinstall -U pip==${pipver} \
41+
&& pip install setuptools==${setupver} wheel
42+
pip install -e git+${repo}@${HEAD}#egg=${package}
43+
cd src/${package}
44+
make install-dependencies
45+
make dist
46+
make test
47+
cp dist/${package}*tar.gz ../../../testenv3/
48+
pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
49+
cd ../.. # no subdir named ${proj} here, safe for py.testing the installed module
50+
bin/${run_tests}
51+
52+
# Is the distribution in testenv2 complete enough to build another
53+
# functional distribution?
54+
55+
cd ../testenv3/
56+
source bin/activate
57+
rm lib/python-wheels/setuptools* \
58+
&& pip install --force-reinstall -U pip==${pipver} \
59+
&& pip install setuptools==${setupver} wheel
60+
pip install ${package}*tar.gz
61+
pip install pytest
62+
mkdir out
63+
tar --extract --directory=out -z -f ${package}*.tar.gz
64+
cd out/${package}*
65+
make dist
66+
make test
67+
pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install
68+
mkdir ../not-${module}
69+
pushd ../not-${module} ; ../../bin/${run_tests}; popd

‎v1.0/salad/requirements.txt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
requests
2-
ruamel.yaml
3-
rdflib >= 4.1.
4-
rdflib-jsonld >= 0.3.0
5-
mistune
6-
typing ; python_version>="2.7"
7-
avro ; python_version<"3"
8-
avro-python3 ; python_version>="3"
9-
1+
typing==3.5.3
2+
avro-cwl ; python_version>="3"
3+
future ; python_version>="3"
4+
avro==1.8.1 ; python_version<"3"
5+
ruamel.yaml>=0.12.4, <0.15
6+
rdflib==4.2.2
7+
rdflib-jsonld==0.4.0
8+
mistune==0.7.3
9+
CacheControl==0.11.7
10+
lockfile==0.12.2

‎v1.0/salad/schema_salad/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import absolute_import
12
import logging
23
import sys
34
import typing

0 commit comments

Comments
 (0)