now that mypy and flake8 are running again, fix them

common-workflow-language · Apr 13, 2018 · 6e0acd8 · 6e0acd8
1 parent 04022ad
commit 6e0acd8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,15 @@ matrix:
 jobs:
   include:
     - stage: release-test
-      script: RELEASE_SKIP=head PYVER=2.7 ./release-test.sh && RELEASE_SKIP=head PYVER=3 ./release-test.sh
+      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
 script: tox

diff --git a/cwltest/tests/mock_cwl_runner.py b/cwltest/tests/mock_cwl_runner.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()
diff --git a/cwltest/tests/test_argparse.py b/cwltest/tests/test_argparse.py
@@ -15,4 +15,3 @@ def test_arg(self):
 
 if __name__ == '__main__':
     unittest.main()
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@ def test_arg(self):

		if __name__ == '__main__':
		unittest.main()