Merge pull request #2610 from lamblin/rc2

.travis.yml

@@ -15,9 +15,7 @@ before_install:
   - conda update --yes conda
 
 install:
-# We support scipy 0.7.2, but it is not available on conda.
-# So we test with 0.11. Our internal buildbot have 0.7.2.
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then conda create --yes -q -n pyenv mkl python=2.6 numpy=1.6 scipy=0.11 nose=1.1 pyparsing=1.5 pip; fi
+  - 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; 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 pip; fi
   - source activate pyenv
   - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install pydot; fi

doc/install.txt

@@ -23,7 +23,8 @@ instructions below for detailed installation steps):
     Python_ >= 2.6
         The development package (``python-dev`` or ``python-devel``
         on most Linux distributions) is recommended (see just below).
-	Python 2.4 was supported up to and including the release 0.6.
+        Python 2.4 was supported up to and including the release 0.6.
+        Python 3 is supported via 2to3 only, starting from 3.3.
 
     ``g++``, ``python-dev``
         Not technically required but *highly* recommended, in order to compile
@@ -32,16 +33,13 @@ instructions below for detailed installation steps):
         g++ >= 4.2 (for openmp that is currently always used)
         more recent version recommended!
 
-    `NumPy <http://numpy.scipy.org/>`_ >= 1.5.0
+    `NumPy <http://numpy.scipy.org/>`_ >= 1.6.2
         Earlier versions could work, but we don't test it.
 
-    `SciPy <http://scipy.org>`_
+    `SciPy <http://scipy.org>`_ >= 0.11
         Only currently required for sparse matrix and special functions
-        support, but *highly* recommended. We recommend SciPy
-        >=0.8 if you are using sparse matrices, because ``scipy.sparse``
-        is buggy in 0.6 (the ``scipy.csc_matrix`` version of ``dot()`` has a
-        bug with singleton dimensions, there may be more bugs) and we do not
-        run tests with 0.7.
+        support, but *highly* recommended. SciPy >=0.8 could work,
+        but earlier versions have known bugs with sparse matrices.
 
     A `BLAS`_ installation (with Level 3 functionality)
         Including the development headers (``-dev``, ``-devel``, depending on

setup.py

@@ -43,12 +43,11 @@ Operating System :: POSIX
 Operating System :: Unix
 Operating System :: MacOS
 Programming Language :: Python :: 2
-Programming Language :: Python :: 2.4
-Programming Language :: Python :: 2.5
 Programming Language :: Python :: 2.6
 Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
 Programming Language :: Python :: 3.3
+Programming Language :: Python :: 3.4
 """
 NAME                = 'Theano'
 MAINTAINER          = "LISA laboratory, University of Montreal"
@@ -175,7 +174,7 @@ def do_setup():
           license=LICENSE,
           platforms=PLATFORMS,
           packages=find_packages(),
-          install_requires=['numpy>=1.5.0', 'scipy>=0.7.2'],
+          install_requires=['numpy>=1.6.2', 'scipy>=0.11'],
           package_data={
               '': ['*.txt', '*.rst', '*.cu', '*.cuh', '*.c', '*.sh', '*.pkl',
                    '*.h', 'ChangeLog'],