Some pep8 fixes and changes to tox and travis test plans

Tests cover django 1.8, 1.10

Author: timsavage

.travis.yml

@@ -2,21 +2,19 @@ language: python
 
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
 
 env:
-  - DJANGO="django>=1.9,<1.10"
+  - DJANGO="django>=1.10,<1.11"
   - DJANGO="django>=1.8,<1.9"
-  - DJANGO="django>=1.7,<1.8"
 
-matrix:
-  exclude:
-    - python: "3.5"
-      env: DJANGO="django>=1.7,<1.8"
+#matrix:
+#  exclude:
+#    - python: "2.7"
+#      env: DJANGO="django>=1.11,<1.12"
 
 install:
-  - pip install -q $DJANGO six https://github.com/python-odin/odin/archive/master.zip
+  - pip install -q $DJANGO six odin<=1.0
   - pip install coveralls
 
 script: coverage run django_test_runner/__main__.py baldr

baldr/api/__init__.py

@@ -15,12 +15,14 @@
 from odin.exceptions import CodecDecodeError, ValidationError
 from odin.utils import getmeta
 
-from .constants import *  # noqa
-from .route_decorators import *  # noqa
 from .. import content_type_resolvers
 from ..resources import Error
 from ..exceptions import ImmediateErrorHttpResponse, ImmediateHttpResponse
 
+from .constants import *  # noqa
+from .route_decorators import *  # noqa
+
+
 logger = logging.getLogger(__name__)
 
 CODECS = {json_codec.CONTENT_TYPE: json_codec}
@@ -71,7 +73,7 @@ def url(self, regex, view, kwargs=None, name=None, prefix=''):
         Regex should be a part regex that applies only to the targeted method ie::
 
             self.url("(\d+)", ...)
-            
+
         """
         if regex:
             return url(r'^%s/%s/?$' % (self.url_prefix + self.api_name.lower(), regex), view, kwargs, name, prefix)

baldr/api/constants.py

@@ -15,3 +15,6 @@
 
 PATH_TYPE_COLLECTION = 'collection'
 PATH_TYPE_RESOURCE = 'resource'
+
+
+__all__ = [i for i in locals() if i.isupper()]

baldr/api/route_decorators.py

@@ -63,12 +63,14 @@ def inner(f):
 
     return inner(func) if func else inner
 
+
 collection = collection_action = action = route
 
 
 def resource_route(func=None, name=None, method=constants.GET, resource=None):
     return route(func, name, constants.PATH_TYPE_RESOURCE, method, resource)
 
+
 detail_route = detail_action = resource_route
 
 

django_test_runner/__main__.py

@@ -1,9 +1,11 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
+
 import os
 import sys
-from optparse import OptionParser
 import django
+
+from optparse import OptionParser
 from django.conf import settings
 from django.core.management import call_command
 
@@ -79,5 +81,6 @@ def main():
 
     call_command("test", app_name)
 
+
 if __name__ == "__main__":
     main()

django_test_runner/urls.py

@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls import patterns
+
 urlpatterns = patterns('')

requirements.txt

@@ -1,4 +1,3 @@
 six
 odin >=1.0
 django >=1.8
-

tox.ini

@@ -5,66 +5,37 @@
 #
 [tox]
 envlist =
-    py27-django17,
-    py34-django17,
     py27-django18,
-    py34-django18,
-    py27-django19,
-    py34-django19,
-    pep8,
-    py3pep8
+    py35-django18,
+    py35-django110,
+    pep8
 
 [testenv]
 commands = coverage run django_test_runner/__main__.py baldr
 
-[testenv:py27-django17]
-basepython = python2.7
-deps =
-    coverage
-    https://github.com/timsavage/odin/archive/master.zip
-    django>=1.7,<1.8
-
-[testenv:py34-django17]
-basepython = python3.4
-deps =
-    coverage
-    https://github.com/timsavage/odin/archive/master.zip
-    django>=1.7,<1.8
-
 [testenv:py27-django18]
 basepython = python2.7
 deps =
     coverage
-    https://github.com/timsavage/odin/archive/master.zip
-    django>=1.8,<1.9
+    odin >=1.0
+    django >=1.8,<1.9
 
-[testenv:py34-django18]
-basepython = python3.4
+[testenv:py35-django18]
+basepython = python3.5
 deps =
     coverage
-    https://github.com/timsavage/odin/archive/master.zip
+    odin >=1.0
     django>=1.8,<1.9
 
-[testenv:py27-django19]
-basepython = python2.7
-deps =
-    coverage
-    https://github.com/timsavage/odin/archive/master.zip
-    django>=1.9,<1.10
-
-[testenv:py34-django19]
-basepython = python3.4
+[testenv:py35-django110]
+basepython = python3.5
 deps =
     coverage
-    https://github.com/timsavage/odin/archive/master.zip
-    django>=1.9,<1.10
+    odin >=1.0
+    django>=1.10,<1.11
 
 [testenv:pep8]
-deps = flake8
-commands = flake8 .
-
-[testenv:py3pep8]
-basepython = python3.4
+basepython = python3.5
 deps = flake8
 commands = flake8 .