Merge pull request #51 from common-workflow-language/tighten-typecheck

tighten up types

Author: mr-c

.travis.yml

@@ -1,20 +1,13 @@
+sudo: false
 language: python
-python: 2.7
+python:
+  - 2.7
+  - 3.5
 os:
   - linux
-env:
-  - TOX_ENV=py27-lint
-  - TOX_ENV=py27-unit
-  - TOX_ENV=py34-mypy
-#  - TOX_ENV=py34-lint
-#  - TOX_ENV=py33-lint
-#  - TOX_ENV=py34-unit
-#  - TOX_ENV=py33-unit
 
 install:
-  - pip install tox
-
-script: tox -e $TOX_ENV
-
+  - pip install tox-travis
+script: tox
 notifications:
   email: false

Makefile

@@ -170,7 +170,9 @@ list-author-emails:
 	@git log --format='%aN,%aE' | sort -u | grep -v 'root'
 
 mypy: ${PYSOURCES}
-	MYPYPATH=typeshed/2.7 mypy --py2 --disallow-untyped-calls schema_salad
+	MYPYPATH=typeshed/2.7 mypy --py2 --disallow-untyped-calls \
+		 --fast-parser --warn-redundant-casts --warn-unused-ignores \
+		 schema_salad
 
 jenkins:
 	rm -Rf env && virtualenv env

schema_salad/flatten.py

@@ -21,4 +21,4 @@ def flatten(l, ltypes=(list, tuple)):
             else:
                 l[i:i + 1] = l[i]
         i += 1
-    return ltype(l)  # type: ignore
+    return ltype(l)

schema_salad/main.py

@@ -188,7 +188,7 @@ def main(argsl=None):  # type: (List[str]) -> int
         document, doc_metadata = document_loader.resolve_ref(uri)
     except (validate.ValidationException, RuntimeError) as e:
         _logger.error("Document `%s` failed validation:\n%s",
-                      args.document, e, exc_info=(e if args.debug else False))
+                      args.document, e, exc_info=args.debug)
         return 1
 
     # Optionally print the document after ref resolution

schema_salad/ref_resolver.py

@@ -763,7 +763,7 @@ def validate_links(self, document, base_url):
 
         for key, val in iterator:
             try:
-                document[key] = self.validate_links(val, docid)  # type: ignore
+                document[key] = self.validate_links(val, docid)
             except validate.ValidationException as v:
                 if key not in self.nolinkcheck:
                     docid2 = self.getid(val)

schema_salad/schema.py

@@ -351,8 +351,7 @@ def make_valid_avro(items, alltypes, found, union=False):
         if items in alltypes and avro_name(items) not in found:
             return cast(Dict, make_valid_avro(alltypes[items], alltypes, found,
                         union=union))
-        items = avro_name(items)  # type: ignore
-        # bug in mypy 0.3.1, fixed in 0.4-dev
+        items = avro_name(items)
     return items
 
 

tox.ini

@@ -1,15 +1,21 @@
 [tox]
 #envlist = py35-lint,py34-lint,py33-lint,py27-lint,py35-unit,py34-unit,py33-unit,py27-unit
-envlist = py27-lint, py27-unit, py34-mypy
+envlist = py27-lint, py27-unit, py35-mypy
 skipsdist = True
 
+[tox:travis]
+2.7 = py27
+3.5 = py35-mypy
+
 [testenv]
 deps = -rrequirements.txt
 
-[testenv:py34-mypy]
+[testenv:py35-mypy]
 commands = make mypy
 whitelist_externals = make
-deps = mypy-lang>=0.4
+deps =
+  mypy-lang>=0.4
+  typed-ast
 
 [testenv:py35-lint]
 commands = flake8 schema_salad setup.py