提交 c23a145c authored 作者: carriepl's avatar carriepl

Merge pull request #3442 from nouiz/numpy_ver

update numpy version to 1.7.0
...@@ -24,7 +24,7 @@ before_install: ...@@ -24,7 +24,7 @@ before_install:
- conda update --yes conda - conda update --yes conda
install: install:
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then conda create --yes -q -n pyenv mkl python=2.6 numpy=1.6.2 scipy=0.11 nose=1.1 pyparsing=1.5 pip flake8==2.3 six==1.9.0 pep8==1.6.2 pyflakes==0.8.1; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then conda create --yes -q -n pyenv mkl python=2.6 numpy=1.7.1 scipy=0.11 nose=1.3.0 pyparsing=1.5 pip flake8==2.3 six==1.9.0 pep8==1.6.2 pyflakes==0.8.1; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then conda create --yes -q -n pyenv mkl python=3.3 numpy=1.9.1 scipy=0.14.0 nose=1.3.4 pyparsing=1.5 pip flake8==2.3 six==1.9.0 pep8==1.6.2 pyflakes==0.8.1; fi - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then conda create --yes -q -n pyenv mkl python=3.3 numpy=1.9.1 scipy=0.14.0 nose=1.3.4 pyparsing=1.5 pip flake8==2.3 six==1.9.0 pep8==1.6.2 pyflakes==0.8.1; fi
- source activate pyenv - source activate pyenv
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install pydot; fi - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install pydot; fi
......
...@@ -33,7 +33,7 @@ instructions below for detailed installation steps): ...@@ -33,7 +33,7 @@ instructions below for detailed installation steps):
g++ >= 4.2 (for openmp that is currently always used) g++ >= 4.2 (for openmp that is currently always used)
more recent version recommended! more recent version recommended!
`NumPy <http://numpy.scipy.org/>`_ >= 1.6.2 `NumPy <http://numpy.scipy.org/>`_ >= 1.7.1
Earlier versions could work, but we don't test it. Earlier versions could work, but we don't test it.
`SciPy <http://scipy.org>`_ >= 0.11 `SciPy <http://scipy.org>`_ >= 0.11
...@@ -53,7 +53,7 @@ instructions below for detailed installation steps): ...@@ -53,7 +53,7 @@ instructions below for detailed installation steps):
The following libraries and software are optional: The following libraries and software are optional:
`nose <http://somethingaboutorange.com/mrl/projects/nose/>`_ `nose <http://somethingaboutorange.com/mrl/projects/nose/>`_ >= 1.3.0
Recommended, to run Theano's test-suite. Recommended, to run Theano's test-suite.
`Sphinx <http://sphinx.pocoo.org/>`_ >= 0.5.1, `pygments <http://pygments.org/>`_ `Sphinx <http://sphinx.pocoo.org/>`_ >= 0.5.1, `pygments <http://pygments.org/>`_
......
...@@ -161,7 +161,8 @@ def do_setup(): ...@@ -161,7 +161,8 @@ def do_setup():
license=LICENSE, license=LICENSE,
platforms=PLATFORMS, platforms=PLATFORMS,
packages=find_packages(), packages=find_packages(),
install_requires=['numpy>=1.6.2', 'scipy>=0.11', 'six>=1.9.0'], # 1.7.0 give too much warning related to numpy.diagonal.
install_requires=['numpy>=1.7.1', 'scipy>=0.11', 'six>=1.9.0'],
package_data={ package_data={
'': ['*.txt', '*.rst', '*.cu', '*.cuh', '*.c', '*.sh', '*.pkl', '': ['*.txt', '*.rst', '*.cu', '*.cuh', '*.c', '*.sh', '*.pkl',
'*.h', '*.cpp', 'ChangeLog'], '*.h', '*.cpp', 'ChangeLog'],
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论