Merge branch '2.2' into pyup-update-pytest-3.2.5-to-3.3.2

6 years ago · 29b9b0431c
parent 403645d2f0 cf5b24e829
commit 29b9b0431c
1 changed files with 2 additions and 2 deletions
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@ -2,6 +2,6 @@

 sphinx==1.6.6
 pytest==3.3.2
-pep8==1.7.0
+pep8==1.7.1
 pytest-catchlog==1.2.2
-pytest-timeout==1.2.0
+pytest-timeout==1.2.1