summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2016-02-10 18:04:31 -0800
committerDylan Baker <baker.dylan.c@gmail.com>2016-02-11 11:58:06 -0800
commitc4a5618a5072e26517b5a87f4fb210bbb2a35096 (patch)
tree47478a2249a31a394cedcea686802839720b39dc /tox.ini
parentb7a65af75afb3664a1e908b09c8a39fa4490c2cc (diff)
python: function with six version 1.5.2
CMake actually marks that we require six 1.4.0, however, I can't find any packages anywhere for 1.4.0, and the lowest version I've seen requested is 1.5.2. This fixes requirements for working with six 1.5.2, and sets tox to use 1.5.2 (and a suitable version of mock). Primarily there are a few things we're using that are not available: six.moves.getcwd, six.viewvalues, six.python_2_unicode_compatible. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Tested-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 7cb172255..bc6567249 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,11 +9,11 @@ deps =
mako
nose
coverage
- six
+ six==1.5.2
accel: simplejson
accel: lxml
py27-accel,py{33,34,35}: psutil
- py27-{accel,noaccel}: mock
+ py27-{accel,noaccel}: mock==1.0.1
py27-accel: backports.lzma
py27-accel: subprocess32
generator: numpy