From 7a71b69a87fb53d6478869cceb2b61f4f6db185f Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 10 Jul 2015 19:57:48 -0300
Subject: [PATCH] Pinning mock module to < 1.1 fo py26

It has been announced that mock>=1.1 will be
supported for python 2.7 only.

Conflicts:
	tox.ini
---
 tox.ini | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tox.ini b/tox.ini
index b0afd479a..f5528bb17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,12 @@ deps=
     nose
     mock
 
+[testenv:py26]
+commands= py.test --lsof -rfsxX {posargs:testing}
+deps=
+    nose
+    mock<1.1  # last supported version for py26
+
 [testenv:genscript]
 commands= py.test --genscript=pytest1