diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2016-02-10 18:04:31 -0800 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2016-02-11 11:58:06 -0800 |
| commit | c4a5618a5072e26517b5a87f4fb210bbb2a35096 (patch) | |
| tree | 47478a2249a31a394cedcea686802839720b39dc /CMakeLists.txt | |
| parent | b7a65af75afb3664a1e908b09c8a39fa4490c2cc (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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b82293461..d136edcad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,7 +206,7 @@ set(Python_ADDITIONAL_VERSIONS find_package(PythonInterp REQUIRED) find_package(PythonNumpy 1.6.2 REQUIRED) find_package(PythonMako 0.8.0 REQUIRED) -find_package(PythonSix 1.4.0 REQUIRED) +find_package(PythonSix 1.5.2 REQUIRED) # Default to compiling with debug information (`gcc -g`): if(NOT CMAKE_BUILD_TYPE) |