From 1dab70ed86c3cf2098091b415747309b04773e25 Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Fri, 5 Feb 2016 16:22:58 -0800 Subject: [PATCH] Update CI config a bit more. --- .travis.yml | 2 +- channels/handler.py | 4 ++-- tox.ini | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b0ca09..361fe5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,5 @@ language: python python: - "2.7" - "3.5" -install: pip install tox-travis Django asgiref +install: pip install tox-travis script: tox diff --git a/channels/handler.py b/channels/handler.py index 4dc83e7..06792fe 100644 --- a/channels/handler.py +++ b/channels/handler.py @@ -5,11 +5,11 @@ import logging from threading import Lock from django import http -from django.core.handlers import base from django.core import signals +from django.core.handlers import base from django.core.urlresolvers import set_script_prefix -from django.utils.functional import cached_property from django.utils import six +from django.utils.functional import cached_property logger = logging.getLogger('django.request') diff --git a/tox.ini b/tox.ini index 4cde18b..35e7158 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,7 @@ setenv = PYTHONPATH = {toxinidir}:{toxinidir} deps = autobahn + asgiref>=0.9 six redis==2.10.5 py27: mock @@ -19,7 +20,7 @@ deps = django-16: Django>=1.6,<1.7 django-17: Django>=1.7,<1.8 django-18: Django>=1.8,<1.9 - django-19: Django==1.9b1 + django-19: Django>=1.9,<1.10 commands = flake8: flake8 isort: isort -c -rc channels