Merge pull request #66 from common-workflow-language/fix_tests

Fix tests

Author: mr-c

.travis.yml

@@ -1,6 +1,11 @@
 sudo: false
 language: python
-
+cache: pip
+python:
+ - 2.7
+ - 3.4
+ - 3.5
+ - 3.6
 matrix:
   include:
     - os: linux
@@ -10,6 +15,17 @@ matrix:
     - os: osx
       language: generic
       python: 2.7
+jobs:
+  include:
+    - stage: release-test
+      python: 2.7
+      script: RELEASE_SKIP=head PYVER=2.7 ./release-test.sh
+    - python: 3.4
+      script: RELEASE_SKIP=head PYVER=3 ./release-test.sh
+    - python: 3.5
+      script: RELEASE_SKIP=head PYVER=3 ./release-test.sh
+    - python: 3.6
+      script: RELEASE_SKIP=head PYVER=3 ./release-test.sh
 
 install:
   - pip2 install tox-travis || pip3 install tox-travis

MANIFEST.in

@@ -1,6 +1,6 @@
 include Makefile gittaggers.py
-include tests/*
-include tests/test-data/*
+include cwltest/tests/*
+include cwltest/tests/test-data/*
 global-exclude *~
 global-exclude *.pyc
 

Makefile

@@ -33,7 +33,7 @@ VERSION=1.0.$(shell date +%Y%m%d%H%M%S --utc --date=`git log --first-parent \
 mkfile_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 ## all         : default task
-all:
+all: FORCE
 	pip install -e .
 
 ## help        : print this help message and exit
@@ -131,7 +131,7 @@ diff-cover.html: coverage-gcovr.xml coverage.xml
 		--html-report diff-cover.html
 
 ## test        : run the ${MODULE} test suite
-test: FORCE
+test: all
 	./setup.py test
 
 sloccount.sc: ${PYSOURCES} Makefile

tests/__init__.py renamed to cwltest/tests/__init__.py

@@ -5,7 +5,7 @@
 ERROR_TOOL = "return-1.cwl"
 
 
-def main():
+def main():  # type: ()->int
     parser = argparse.ArgumentParser()
     parser.add_argument("processfile")
     parser.add_argument("jobfile")
@@ -24,4 +24,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()