Merge pull request #68 from asmodehn/pyup-pin-pytest-timeout-1.2.0

Pin pytest-timeout to latest version 1.2.0
pyros-dev · Jan 13, 2017 · d700ab3 · d700ab3
2 parents aaef388 + 328af14
commit d700ab3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cmake/catkin-pip-fixups.req b/cmake/catkin-pip-fixups.req
@@ -8,7 +8,7 @@ nose==1.3.7
 # Also install pytest since we support it
 pytest==3.0.5
 pytest-cov==2.4.0
-pytest-timeout
+pytest-timeout==1.2.0
 
 # Fixing security since python 2.7.6 on trusty is broken : https://stackoverflow.com/questions/29099404/ssl-insecureplatform-error-when-using-requests-package
 # On trusty it seems that installing libgnutls28-dev fixes the issue...