Update pre-commit, remove Python 3.4 from tests

- Also ran fix-encoding-pragma and reorder-python-imports on all files
- make sure pre-commit hooks are installed whenever people run tests

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    sha: 46251c9523506b68419aefdf5ff6ff2fbc4506a4
+    sha: a11d9314b22d8f8c7556443875b731ef05965464
     hooks:
     -   id: autopep8-wrapper
         args:
@@ -9,14 +9,13 @@
     -   id: check-yaml
     -   id: debug-statements
     -   id: end-of-file-fixer
+    -   id: fix-encoding-pragma
     -   id: flake8
-        args:
-        - --max-line-length=131
     -   id: name-tests-test
     -   id: trailing-whitespace
     -   id: requirements-txt-fixer
         files: requirements-dev.txt
 -   repo: git://github.com/asottile/reorder_python_imports
-    sha: 9aa4d08f9a28d3defc5e4db3c3b77d1a9980fd1a
+    sha: v0.3.2
     hooks:
     -   id: reorder-python-imports

.travis.yml

@@ -2,7 +2,6 @@ language: python
 matrix:
   include:
   - env: TOXENV=py27
-  - env: TOXENV=py34
   - python: "3.5"
     env: TOXENV=py35
   - python: "3.6"

Makefile

@@ -14,7 +14,7 @@ docs:
 install:
 	pip install .
 
-test:
+test: install-hooks
 	tox
 
 tests: test

bravado_core/__init__.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 version = "4.6.1"

bravado_core/content_type.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 APP_JSON = 'application/json'

bravado_core/docstring.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import logging
 
 from six import iteritems

bravado_core/exception.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys
 
 import six

bravado_core/formatter.py

@@ -1,15 +1,16 @@
+# -*- coding: utf-8 -*-
 """
 Support for the 'format' key in the swagger spec as outlined in
 https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md#dataTypeFormat
 """
 import functools
 from collections import namedtuple
 
-import six
 import dateutil.parser
+import pytz
+import six
 
 from bravado_core import schema
-import pytz
 
 if six.PY3:
     long = int

bravado_core/marshal.py

@@ -1,13 +1,16 @@
+# -*- coding: utf-8 -*-
 from six import iteritems
 
-from bravado_core import formatter, schema
+from bravado_core import formatter
+from bravado_core import schema
 from bravado_core.exception import SwaggerMappingError
-from bravado_core.model import is_model, MODEL_MARKER
+from bravado_core.model import is_model
+from bravado_core.model import MODEL_MARKER
+from bravado_core.schema import get_spec_for_prop
+from bravado_core.schema import handle_null_value
 from bravado_core.schema import is_dict_like
 from bravado_core.schema import is_list_like
-from bravado_core.schema import handle_null_value
 from bravado_core.schema import SWAGGER_PRIMITIVES
-from bravado_core.schema import get_spec_for_prop
 
 
 def marshal_schema_object(swagger_spec, schema_object_spec, value):

bravado_core/model.py

@@ -1,5 +1,6 @@
-from functools import partial
+# -*- coding: utf-8 -*-
 import logging
+from functools import partial
 
 from six import iteritems
 

bravado_core/param.py

@@ -1,8 +1,9 @@
-from functools import partial
+# -*- coding: utf-8 -*-
 import logging
+from functools import partial
 
-import six
 import simplejson as json
+import six
 
 from bravado_core import schema
 from bravado_core.content_type import APP_JSON

bravado_core/request.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from six import iteritems
 
 from bravado_core.operation import log

bravado_core/resource.py

@@ -1,5 +1,6 @@
-from collections import defaultdict
+# -*- coding: utf-8 -*-
 import logging
+from collections import defaultdict
 
 from six import iteritems
 
@@ -83,6 +84,7 @@ class Resource(object):
     :param ops: operations associated with this resource (by tag)
     :type ops: dict where (key, value) = (op_name, Operation)
     """
+
     def __init__(self, name, ops):
         log.debug(u"Building resource '%s'" % name)
         self.name = name

bravado_core/response.py

@@ -1,9 +1,11 @@
+# -*- coding: utf-8 -*-
 from six import iteritems
 
 from bravado_core.content_type import APP_JSON
+from bravado_core.exception import MatchingResponseNotFound
+from bravado_core.exception import SwaggerMappingError
 from bravado_core.unmarshal import unmarshal_schema_object
 from bravado_core.validate import validate_schema_object
-from bravado_core.exception import MatchingResponseNotFound, SwaggerMappingError
 
 # Response bodies considered to be empty
 EMPTY_BODIES = (None, '', '{}', 'null')

bravado_core/schema.py

@@ -1,5 +1,6 @@
-from collections import Mapping
+# -*- coding: utf-8 -*-
 import copy
+from collections import Mapping
 
 from six import iteritems
 

bravado_core/security_definition.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import logging
 
 log = logging.getLogger(__name__)

bravado_core/security_requirement.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import logging
 
 import six

bravado_core/spec.py

@@ -5,23 +5,28 @@
 import logging
 import os.path
 import warnings
-import yaml
 
+import yaml
 from jsonschema import FormatChecker
 from jsonschema.compat import urlopen
 from jsonschema.validators import RefResolver
 from six import iteritems
 from six.moves.urllib import parse as urlparse
 from swagger_spec_validator import validator20
-from swagger_spec_validator.ref_validators import attach_scope, in_scope
+from swagger_spec_validator.ref_validators import attach_scope
+from swagger_spec_validator.ref_validators import in_scope
 
 from bravado_core import formatter
-from bravado_core.exception import SwaggerSchemaError, SwaggerValidationError
+from bravado_core.exception import SwaggerSchemaError
+from bravado_core.exception import SwaggerValidationError
 from bravado_core.formatter import return_true_wrapper
-from bravado_core.model import tag_models, collect_models
+from bravado_core.model import collect_models
+from bravado_core.model import tag_models
 from bravado_core.resource import build_resources
+from bravado_core.schema import is_dict_like
+from bravado_core.schema import is_list_like
+from bravado_core.schema import is_ref
 from bravado_core.security_definition import SecurityDefinition
-from bravado_core.schema import is_dict_like, is_list_like, is_ref
 
 
 log = logging.getLogger(__name__)

bravado_core/swagger20_validator.py

@@ -1,13 +1,15 @@
+# -*- coding: utf-8 -*-
 import functools
 
-from jsonschema import validators, _validators
+from jsonschema import _validators
+from jsonschema import validators
 from jsonschema.exceptions import ValidationError
 from jsonschema.validators import Draft4Validator
+from swagger_spec_validator.ref_validators import in_scope
 
 from bravado_core.schema import is_param_spec
 from bravado_core.schema import is_prop_nullable
 from bravado_core.schema import is_required
-from swagger_spec_validator.ref_validators import in_scope
 
 """Draft4Validator is not completely compatible with Swagger 2.0 schema
 objects like parameter, etc. Swagger20Validator is an extension of

bravado_core/unmarshal.py

@@ -4,12 +4,13 @@
 from bravado_core import formatter
 from bravado_core import schema
 from bravado_core.exception import SwaggerMappingError
-from bravado_core.model import is_model, MODEL_MARKER
+from bravado_core.model import is_model
+from bravado_core.model import MODEL_MARKER
 from bravado_core.schema import collapsed_properties
 from bravado_core.schema import get_spec_for_prop
+from bravado_core.schema import handle_null_value
 from bravado_core.schema import is_dict_like
 from bravado_core.schema import is_list_like
-from bravado_core.schema import handle_null_value
 from bravado_core.schema import SWAGGER_PRIMITIVES
 
 

bravado_core/validate.py

@@ -1,13 +1,15 @@
+# -*- coding: utf-8 -*-
 """
 Delegate as much validation as possible out to jsonschema. This module serves
 as the single point of entry for validations should we need to further
 customize the behavior.
 """
+from six import itervalues
 
-from bravado_core.exception import SwaggerMappingError, SwaggerSecurityValidationError
+from bravado_core.exception import SwaggerMappingError
+from bravado_core.exception import SwaggerSecurityValidationError
 from bravado_core.schema import SWAGGER_PRIMITIVES
 from bravado_core.swagger20_validator import get_validator_type
-from six import itervalues
 
 
 def validate_schema_object(swagger_spec, schema_object_spec, value):

docs/source/conf.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sphinx_rtd_theme
 
 from bravado_core import version

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 # Copyright (c) 2013, Digium, Inc.
 # Copyright (c) 2014-2015, Yelp, Inc.
 import os

tests/conftest.py

@@ -1,9 +1,10 @@
+# -*- coding: utf-8 -*-
 import base64
 import os
-import simplejson as json
-from six.moves.urllib import parse as urlparse
 
 import pytest
+import simplejson as json
+from six.moves.urllib import parse as urlparse
 
 import bravado_core.formatter
 from bravado_core.spec import Spec

tests/docstring/__init__.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 __author__ = 'spatel'

tests/docstring/conftest.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 

tests/docstring/create_param_docstring_test.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 from bravado_core.docstring import create_param_docstring

tests/docstring/formatted_type_test.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 import pytest
 
-from bravado_core.exception import SwaggerMappingError
 from bravado_core.docstring import formatted_type
+from bravado_core.exception import SwaggerMappingError
 
 
 def test_type_only():

tests/exception/wrap_exception_test.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 from bravado_core.exception import wrap_exception

tests/formatter/to_python_test.py

@@ -1,7 +1,9 @@
-from datetime import date, datetime
+# -*- coding: utf-8 -*-
+from datetime import date
+from datetime import datetime
 
-from mock import patch
 import six
+from mock import patch
 
 from bravado_core.formatter import to_python
 from bravado_core.spec import Spec

tests/formatter/to_wire_test.py

@@ -1,11 +1,13 @@
-from datetime import datetime, date
+# -*- coding: utf-8 -*-
+from datetime import date
+from datetime import datetime
 
-from mock import patch
 import six
+from mock import patch
+from pytz import timezone
 
 from bravado_core.formatter import to_wire
 from bravado_core.spec import Spec
-from pytz import timezone
 
 
 def test_none(minimal_swagger_spec):

tests/marshal/marshal_array_test.py

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 import copy
 
 import pytest
-from bravado_core.exception import SwaggerMappingError
 
+from bravado_core.exception import SwaggerMappingError
 from bravado_core.marshal import marshal_array
 from bravado_core.spec import Spec
 

tests/marshal/marshal_model_test.py

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 import copy
+
 import pytest
 
 from bravado_core.exception import SwaggerMappingError

tests/marshal/marshal_schema_object_test.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import copy
 from collections import defaultdict
 

tests/model/collect_models_test.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 import pytest
 
-from bravado_core.model import collect_models, MODEL_MARKER
+from bravado_core.model import collect_models
+from bravado_core.model import MODEL_MARKER
 from bravado_core.spec import Spec
 
 

tests/model/compare_test.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from bravado_core.model import compare
 
 

tests/model/conftest.py

@@ -1,5 +1,6 @@
-from mock import Mock
+# -*- coding: utf-8 -*-
 import pytest
+from mock import Mock
 
 from bravado_core.model import create_model_type
 from bravado_core.spec import Spec

tests/model/create_model_repr_test.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 import pytest
 import six
+from mock import Mock
 
 from bravado_core.model import create_model_repr
-
-from mock import Mock
 from bravado_core.spec import Spec