Merge branch 'master' into pyup-update-pytest-3.3.0-to-3.3.1

opsdroid · Dec 12, 2017 · 5d97cb2 · 5d97cb2
2 parents ed65d87 + 2ea4f9b
commit 5d97cb2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,5 +1,5 @@
 flake8==3.5.0
-pylint==1.7.4
+pylint==1.7.5
 coveralls==1.2.0
 astroid==1.5.3
 pytest==3.3.1
@@ -8,5 +8,5 @@ pytest-timeout==1.2.1
 pytest-catchlog==1.2.2
 pydocstyle==2.1.1
 asynctest==0.11.1
-requests_mock==1.3.0
+requests_mock==1.4.0
 mypy-lang==0.5.0