Merge 9443e53 into 71ade8b

Yelp · Apr 15, 2016 · b102af8 · b102af8
2 parents 71ade8b + 9443e53
commit b102af8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -37,6 +37,6 @@
         "pyyaml",
         "requests",
         "six",
-        "twisted >= 14.0.0, < 15.5.0", # Python 2.6 support was dropped in 15.5.0
+        "twisted >= 14.0.0",
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -7,6 +7,11 @@ deps =
 commands =
     py.test --capture=no {posargs:tests}
 
+[testenv:py26]
+deps =
+    twisted<15.5
+    {[testenv]deps}
+
 [testenv:flake8]
 deps = flake8
 commands =