From b2d65d770f5e3d62d39da6ebedffbe09f1badd97 Mon Sep 17 00:00:00 2001 From: Anders Pearson Date: Tue, 2 Aug 2016 10:45:11 +0100 Subject: [PATCH 1/3] add a travis test against django 1.10 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6862435..af57d95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ python: env: - DJANGO="Django>=1.8.0,<1.9.0" - DJANGO="Django>=1.9.0,<1.10.0" + - DJANGO="Django>=1.10,<1.11.0" # command to install dependencies install: From 957339466a324b553bd2aef03c3c4526e969b5fd Mon Sep 17 00:00:00 2001 From: Anders Pearson Date: Tue, 2 Aug 2016 11:53:52 +0100 Subject: [PATCH 2/3] pull in some newer requirements for testing --- test_reqs.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test_reqs.txt b/test_reqs.txt index 1aa6a92..5c83585 100644 --- a/test_reqs.txt +++ b/test_reqs.txt @@ -1,9 +1,9 @@ -coverage==4.0.3 +coverage==4.2 mock==2.0.0 -flake8==2.5.4 -django-jenkins==0.18.1 -pep8==1.5.7 -pyflakes==1.1.0 +flake8==3.0.2 +django-jenkins==0.19.0 +pep8==1.7.0 +pyflakes==1.2.3 statsd==3.2.1 django-statsd-mozilla==0.3.16 -ipdb==0.9.3 +ipdb==0.10.1 From 0f4d1cd4fff4b05acffc9b6419296e5cc154d514 Mon Sep 17 00:00:00 2001 From: Anders Pearson Date: Tue, 2 Aug 2016 12:13:10 +0100 Subject: [PATCH 3/3] flake8 fix --- djangowind/auth.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/djangowind/auth.py b/djangowind/auth.py index 8ca05e9..1dd1321 100644 --- a/djangowind/auth.py +++ b/djangowind/auth.py @@ -2,6 +2,11 @@ from django.conf import settings from django.contrib.auth.models import User, Group +from django.core.exceptions import ImproperlyConfigured +from warnings import warn +from django_statsd.clients import statsd +from xml.dom.minidom import parseString +from xml.etree import ElementTree try: from urllib.request import Request @@ -33,12 +38,6 @@ except ImportError: pass -from django.core.exceptions import ImproperlyConfigured -from warnings import warn -from django_statsd.clients import statsd -from xml.dom.minidom import parseString -from xml.etree import ElementTree - def validate_wind_ticket(ticketid): """