From b3115e8dcf89b783a6b37b33e3945f0ee5e48710 Mon Sep 17 00:00:00 2001
From: Andrew Godwin <andrew@aeracode.org>
Date: Sat, 25 Nov 2017 18:35:12 -0800
Subject: [PATCH] Start fixing travis config

---
 .travis.yml |  2 --
 setup.py    | 12 +++++++-----
 tox.ini     |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9672140..84d208f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,6 @@ sudo: false
 language: python
 
 python:
-  - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
 
diff --git a/setup.py b/setup.py
index 2b807cc..368c1d5 100755
--- a/setup.py
+++ b/setup.py
@@ -30,11 +30,13 @@ setup(
     setup_requires=[
         "pytest-runner",
     ],
-    tests_require=[
-        "hypothesis",
-        "tox",
-        "pytest",
-    ],
+    extras_require={
+        "tests": [
+            "hypothesis",
+            "tox",
+            "pytest",
+        ],
+    },
     entry_points={"console_scripts": [
         "daphne = daphne.cli:CommandLineInterface.entrypoint",
     ]},
diff --git a/tox.ini b/tox.ini
index c420d40..1f3f3d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 # We test against the oldest supported Twisted release, and the current release.
 [tox]
-envlist = py{27,34,35,36}-twisted-{old,new}
+envlist = py{35,36}-twisted-{old,new}
 
 [testenv]
 deps =
     twisted-old: twisted==17.1.0
 commands =
     pip install -e .[tests]
-    python -m unittest discover
+    pytest