[Piglit] [PATCH 2/2] dependencies: Bump numpy version to 1.7.0 in cmake and tox

Dylan Baker baker.dylan.c at gmail.com
Thu Feb 11 23:24:35 UTC 2016


The previous version (1.6.2) fails to compile against python 3, and is
from 2012. Version 1.7.0 does compile against python 3, and is still
from February 2013, old enough that even stable Linux distributions
should have picked it up by now.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 CMakeLists.txt | 2 +-
 tox.ini        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d136edc..dba0683 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,7 +204,7 @@ ENDIF()
 set(Python_ADDITIONAL_VERSIONS
     3.5 3.4 3.3 2.7)
 find_package(PythonInterp REQUIRED)
-find_package(PythonNumpy 1.6.2 REQUIRED)
+find_package(PythonNumpy 1.7.0 REQUIRED)
 find_package(PythonMako 0.8.0 REQUIRED)
 find_package(PythonSix 1.5.2 REQUIRED)
 
diff --git a/tox.ini b/tox.ini
index d7a93e6..7a04d69 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ deps =
     py27-{accel,noaccel}: mock==1.0.1
     py27-accel: backports.lzma
     py27-accel: subprocess32
-    generator: numpy
+    generator: numpy==1.7.0
 commands = 
     {accel,noaccel}: nosetests unittests []
     generator: nosetests generated_tests/test_generators.py []
-- 
2.7.1



More information about the Piglit mailing list