libcloud git commit: Inside tox targets use base requirements from the requirements-tests.txt file.

[to...@apache.org]

Repository: libcloud
Updated Branches:
  refs/heads/trunk 0efa5b783 -> 5c8bab406


Inside tox targets use base requirements from the requirements-tests.txt file.

This way we make sure a pinned version of mock which works under Python 2.6 is
used.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5c8bab40
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5c8bab40
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5c8bab40

Branch: refs/heads/trunk
Commit: 5c8bab40633f5753c8ea510e02f8b3e68222350f
Parents: 0efa5b7
Author: Tomaz Muraus <to...@tomaz.me>
Authored: Sat Jul 18 17:54:49 2015 +0800
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Sat Jul 18 17:58:27 2015 +0800

----------------------------------------------------------------------
 tox.ini | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/5c8bab40/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index e612f5f..1cbb3df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,8 @@ setenv =
     PIP_USE_MIRRORS=1
 
 [testenv]
-deps = backports.ssl_match_hostname
-       mock
+deps = -r{toxinidir}/requirements-tests.txt
+       backports.ssl_match_hostname
        unittest2
        lockfile
        paramiko
@@ -14,8 +14,8 @@ commands = cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
 
 [testenv:py25]
 setenv = PIP_INSECURE=1
-deps = backports.ssl_match_hostname
-       mock
+deps = -r{toxinidir}/requirements-tests.txt
+       backports.ssl_match_hostname
        unittest2
        lockfile
        ssl
@@ -23,23 +23,23 @@ deps = backports.ssl_match_hostname
        paramiko
 
 [testenv:pypy]
-deps = backports.ssl_match_hostname
-       mock
+deps = -r{toxinidir}/requirements-tests.txt
+       backports.ssl_match_hostname
        unittest2
        lockfile
 
 [testenv:py32]
-deps = mock
+deps = -r{toxinidir}/requirements-tests.txt
        lockfile
 
 [testenv:py33]
-deps = mock
+deps = -r{toxinidir}/requirements-tests.txt
        lockfile
 
 [testenv:py34]
 # At some point we can switch to use the stdlib provided mock module on
 # Python3.4+
-deps = mock
+deps = -r{toxinidir}/requirements-tests.txt
        lockfile
 
 [testenv:docs]