Merge pull request #343 from cfpb/py3-testing

Py3 testing

.coveragerc

@@ -18,3 +18,4 @@ omit =
 exclude_lines = 
     pragma: no cover
     if __name__ == .__main__.:
+    if six.PY2:

.flake8

@@ -0,0 +1,22 @@
+[flake8]
+ignore = 
+    # There's nothing wrong with assigning lambdas
+    E731,
+    # PEP8 weakly recommends Knuth-style line breaks before binary
+    # operators
+    W503, W504
+exclude = 
+    # These are directories that it's a waste of time to traverse
+    .eggs,
+    .env,
+    .git,
+    .tox,
+    .venv,
+    bin,
+    config,
+    docs,
+    gulp,
+    node_modules,
+    */migrations/*.py,
+    paying_for_college/config/*
+    paying_for_college/disclosures/urls.py

.travis.yml

@@ -1,16 +1,18 @@
 language: python
 python:
-- '2.7'
+- 2.7
+- 3.6
 install:
+- pip install tox-travis
 - npm install -g gulp-cli
 - pip install coveralls tox
 script:
-- npm config set package-lock false
 - tox
+- python2.7 setup.py bdist_wheel --universal
+- npm config set package-lock false
 - npm test
-- python2.7 setup.py bdist_wheel
-- ls dist/*
 - gulp lint --travis
+- ls dist/*
 after_success:
 - coveralls
 deploy:

paying_for_college/admin.py

@@ -1,8 +1,12 @@
 #!/usr/bin/env python
 from __future__ import absolute_import
+
 from django.contrib import admin
-from .models import School, Program, Alias, Nickname, Contact, Disclosure
-from .models import BAHRate, Feedback, Worksheet, ConstantRate, ConstantCap
+
+from paying_for_college.models import (
+    Alias, BAHRate, ConstantCap, ConstantRate, Contact, Disclosure, Feedback,
+    Nickname, Program, School, Worksheet
+)
 
 
 class DisclosureAdmin(admin.ModelAdmin):
@@ -41,6 +45,7 @@ class NicknameAdmin(admin.ModelAdmin):
     list_display = ('nickname', 'institution', 'is_female')
     search_fields = ['nickname']
 
+
 admin.site.register(Disclosure, DisclosureAdmin)
 admin.site.register(ConstantRate, ConstantRateAdmin)
 admin.site.register(ConstantCap, ConstantCapAdmin)

paying_for_college/config/settings/base.py

@@ -1,6 +1,8 @@
-from unipath import Path
 import getpass
 
+from unipath import Path
+
+
 LOCAL_USER = getpass.getuser()
 REPOSITORY_ROOT = Path(__file__).ancestor(4)
 PROJECT_ROOT = Path(__file__).ancestor(3)

paying_for_college/config/settings/dev.py

@@ -1,10 +1,12 @@
 from __future__ import absolute_import
+
 import os
 
 import dj_database_url
 
 from .base import *
 
+
 DEBUG = True
 
 DATABASES = {

paying_for_college/config/settings/no_haystack.py

@@ -1,3 +1,4 @@
 from .standalone import *
 
+
 INSTALLED_APPS.remove('haystack')

paying_for_college/config/settings/standalone.py

@@ -1,6 +1,8 @@
 from __future__ import absolute_import
+
 from .dev import *
 
+
 STANDALONE = True
 
 SECRET_KEY = "forstandaloneonly"

paying_for_college/config/urls.py

@@ -1,10 +1,9 @@
-from django.conf.urls import url, include
 from django.conf import settings
-from paying_for_college.views import (LandingView,
-                                      BaseTemplateView,
-                                      URL_ROOT)
+from django.conf.urls import include, url
 from django.contrib import admin
-from django.conf import settings
+
+from paying_for_college.views import URL_ROOT, BaseTemplateView, LandingView
+
 
 try:
     STANDALONE = settings.STANDALONE

paying_for_college/config/wsgi.py

@@ -11,6 +11,7 @@
 
 from django.core.wsgi import get_wsgi_application
 
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "paying_for_college.config.settings.test")
 
 application = get_wsgi_application()