Merge pull request #517 from akhilaananthram/numpy_fix

Upgraded numpy to 1.9.2

Author: rhyolight

.travis.yml

@@ -57,7 +57,7 @@ notifications:
 
 before_install:
   # install gcc-4.8 for C++11 compatibility, #TODO remove when Travis has gcc>=4.8, (it's used for clang too, in coveralls)
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo apt-get -qq update; sudo apt-get -qq install g++-4.8; alias gcc='gcc-4.8'; alias g++='g++-4.8'; sudo apt-get install -qq python-numpy; fi"
+  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo apt-get -qq update; sudo apt-get -qq install g++-4.8; alias gcc='gcc-4.8'; alias g++='g++-4.8'; sudo pip install numpy==1.9.2; fi"
   - "if [ $CC = 'gcc' ]; then export CC='gcc-4.8' && export CXX='g++-4.8'; fi"
   - "if [ $CC = 'clang' ]; then export CXX=clang++; fi"
   # Install cpp-coveralls for reporting test coverage under only linux, see https://github.com/eddyxu/cpp-coveralls

appveyor-scripts/install_python_pip.ps1

@@ -81,8 +81,8 @@ function main () {
     Write-Host "pip install " wheel
     & $pip_path install wheel
 
-    Write-Host "pip install " numpy
-    & $pip_path install -i https://pypi.numenta.com/pypi numpy
+    Write-Host "pip install " numpy==1.9.2
+    & $pip_path install -i https://pypi.numenta.com/pypi numpy==1.9.2
 }
 
 main

external/common/requirements.txt

@@ -0,0 +1,2 @@
+#See http://www.pip-installer.org/en/latest/requirements.html for details
+numpy>=1.9.2

src/CMakeLists.txt

@@ -724,6 +724,8 @@ install(DIRECTORY "${NUMPY_CORE}/lib/"
         DESTINATION lib)
 install(DIRECTORY "${NUMPY_CORE}/include/"
         DESTINATION include)
+install(FILES "${REPOSITORY_DIR}/external/common/requirements.txt"
+        DESTINATION .)
 if(UNIX)
   install(FILES "${PROJECT_BINARY_DIR}/libnupic_core.a"
           DESTINATION lib)