Merge pull request #235 from gsnedders/pytest_expect_11

gsnedders · gsnedders · commit 3b7e01718dea · 2016-04-25T02:14:42.000+01:00
Update pytest-expect to 1.1 and its human readable format; r=nobody!
diff --git a/.pytest.expect b/.pytest.expect
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -2,6 +2,6 @@
 
 flake8
 pytest
-pytest-expect>=1.0,<2.0
+pytest-expect>=1.1,<2.0
 mock
 ordereddict ; python_version < '2.7'
diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@ envlist = {py26,py27,py33,py34,py35,pypy}-{base,optional}
 deps =
   flake8
   pytest
-  pytest-expect>=1.0,<2.0
+  pytest-expect>=1.1,<2.0
   mock
   base: six
   base: webencodings
