Fix build on py2.6 by setting a max version for mock.

dnephin · Jul 17, 2015 · ad21162 · ad21162
1 parent e876875
commit ad21162
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/requirements.txt b/requirements.txt
diff --git a/tox.ini b/tox.ini
@@ -3,14 +3,17 @@ envlist = py26,py27,py33,py34,pypy,docs,coverage
 
 [testenv]
 deps =
-    -rrequirements.txt
+    pyyaml
+    pytest
+    mock <= 1.0.1
+    flake8
 commands =
     py.test {posargs:tests}
     flake8 staticconf tests testing
 
 [testenv:docs]
 deps =
-    -rrequirements.txt
+    {[testenv]deps}
     sphinx >= 1.0
     sphinx_rtd_theme
 changedir = docs
@@ -20,7 +23,7 @@ commands =
 
 [testenv:coverage]
 deps =
-    -rrequirements.txt
+    {[testenv]deps}
     coverage
 commands =
     coverage run --source=staticconf {envbindir}/py.test tests