Merge 0f23abb into 9ca55c4

Yelp · Jun 22, 2016 · 484a8a3 · 484a8a3
2 parents 9ca55c4 + 0f23abb
commit 484a8a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,3 +4,4 @@ httpretty==0.8.14
 mock<1.1.0
 pre-commit
 pytest
+cryptography==1.3.4
diff --git a/tox.ini b/tox.ini
@@ -3,6 +3,7 @@ envlist = py26, py27, py34, flake8
 
 [testenv]
 deps =
+    py26: twisted==15.4
     -rrequirements-dev.txt
 commands =
     py.test --capture=no {posargs:tests}