Merge pull request #4924 from nouiz/drop_old_version

.travis.yml

@@ -8,7 +8,7 @@ cache:
 
 language: python
 python:
-  - "2.6"
+  - "2.7"
   - "3.3"
 
 # command to install dependencies
@@ -16,7 +16,7 @@ before_install:
 # Install miniconda to avoid compiling scipy
   - mkdir -p download
   - cd download
-  - wget -c https://repo.continuum.io/miniconda/Miniconda2-3.19.0-Linux-x86_64.sh -O miniconda.sh
+  - wget -c https://repo.continuum.io/miniconda/Miniconda2-4.1.11-Linux-x86_64.sh -O miniconda.sh
   - chmod +x miniconda.sh
   - ./miniconda.sh -b
   - cd ..
@@ -30,11 +30,10 @@ addons:
    - dvipng
 
 install:
-  - 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 pip flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx; 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 flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda create --yes -q -n pyenv mkl python=2.7 numpy=1.9.1 scipy=0.14 nose=1.3.0 pip flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx libgfortran=1 mkl-service; 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 flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx mkl-service; fi
   - source activate pyenv
-# pydot 1.2 broke support of python 2.6. They won't try to maintain it.
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install pydot==1.1.0; else pip install pydot-ng; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install pydot; else pip install pydot-ng; fi
   - pip install . --no-deps
   - pip install flake8-future-import nose-parameterized==0.5.0
 
@@ -49,7 +48,7 @@ matrix:
   include:
     - python: "3.3"
       env: PART="-e test_flake8.py ." THEANO_FLAGS="mode=FAST_COMPILE"
-    - python: "2.6"
+    - python: "2.7"
       env: PART="-e test_flake8.py ." THEANO_FLAGS="mode=FAST_COMPILE,floatX=float32"
 
 script:

doc/conf.py

@@ -42,11 +42,17 @@ todo_include_todos = True
 napoleon_google_docstring = False
 napoleon_include_special_with_doc = False
 
+# We do it like this to support multiple sphinx version without having warning.
+# Our buildbot consider warning as error.
 try:
-    from sphinx.ext import pngmath
-    extensions.append('sphinx.ext.pngmath')
+    from sphinx.ext import imgmath
+    extensions.append('sphinx.ext.imgmath')
 except ImportError:
-    pass
+    try:
+        from sphinx.ext import pngmath
+        extensions.append('sphinx.ext.pngmath')
+    except ImportError:
+        pass
 
 
 # Add any paths that contain templates here, relative to this directory.

doc/requirements.txt

@@ -8,13 +8,16 @@ Requirements
 .. _BLAS: http://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms
 .. _Python: http://www.python.org/
 
-    Python_ >= 2.6 or >= 3.3
-        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 3 is supported past the 3.3 release.
+    Python_ >= 2.7 or >= 3.3 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.6 was supported up to and including the
+        release 0.8.2. Python 3 is supported past the 3.3 release.
 
-    `NumPy <http://numpy.scipy.org/>`_ >= 1.7.1 < 1.11.1
+    `NumPy <http://numpy.scipy.org/>`_ >= 1.9.1 < 1.11.1
         Earlier versions could work, but we don’t test it.
 
-    `SciPy <http://scipy.org>`_ >= 0.11 < 0.17.1
+    `SciPy <http://scipy.org>`_ >= 0.14 < 0.17.1
         Only currently required for sparse matrix and special functions support, but highly recommended. SciPy >=0.8 could work, but earlier versions have known bugs with sparse matrices.
 
     `BLAS`_ installation (with Level 3 functionality)

setup.py

@@ -31,7 +31,6 @@ Operating System :: POSIX
 Operating System :: Unix
 Operating System :: MacOS
 Programming Language :: Python :: 2
-Programming Language :: Python :: 2.6
 Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
 Programming Language :: Python :: 3.3
@@ -163,7 +162,7 @@ def do_setup():
           platforms=PLATFORMS,
           packages=find_packages(),
           # 1.7.0 give too much warning related to numpy.diagonal.
-          install_requires=['numpy>=1.7.1', 'scipy>=0.11', 'six>=1.9.0'],
+          install_requires=['numpy>=1.9.1', 'scipy>=0.14', 'six>=1.9.0'],
           # pygments is a dependency for Sphinx code highlight
           extras_require={
               'test': ['nose>=1.3.0', 'nose-parameterized>=0.5.0', 'flake8<3'],

theano/configdefaults.py

@@ -1253,7 +1253,7 @@ def default_blas_ldflags():
                                           "mk2_rt"]])
 
         # Anaconda
-        if "Anaconda" in sys.version and sys.platform == "win32":
+        if "Anaconda" in sys.version or "Continuum" in sys.version:
             # If the "mkl-service" conda package (available
             # through Python package "mkl") is installed and
             # importable, then the libraries (installed by conda
@@ -1266,14 +1266,23 @@ def default_blas_ldflags():
                 _logger.info('Conda mkl is not available: %s', e)
             else:
                 # This branch is executed if no exception was raised
-                lib_path = os.path.join(sys.prefix, 'DLLs')
-                flags = ['-L"%s"' % lib_path]
+                if sys.platform == "win32":
+                    lib_path = os.path.join(sys.prefix, 'DLLs')
+                    flags = ['-L"%s"' % lib_path]
+                else:
+                    lib_path = blas_info.get('library_dirs', [])[0]
+                    flags = ['-L%s' % lib_path]
                 flags += ['-l%s' % l for l in ["mkl_core",
                                                "mkl_intel_thread",
                                                "mkl_rt"]]
                 res = try_blas_flag(flags)
                 if res:
                     return res
+                flags.extend(['-Wl,-rpath,' + l for l in
+                              blas_info.get('library_dirs', [])])
+                res = try_blas_flag(flags)
+                if res:
+                    return res
 
         # to support path that includes spaces, we need to wrap it with double quotes on Windows
         path_wrapper = "\"" if os.name == 'nt' else ""
@@ -1344,7 +1353,7 @@ def try_blas_flag(flags):
             return 0;
         }
         """)
-    cflags = flags
+    cflags = list(flags)
     # to support path that includes spaces, we need to wrap it with double quotes on Windows
     path_wrapper = "\"" if os.name == 'nt' else ""
     cflags.extend(['-L%s%s%s' % (path_wrapper, d, path_wrapper) for d in theano.gof.cmodule.std_lib_dirs()])

theano/printing.py

@@ -47,6 +47,9 @@ except ImportError:
         # tests should not fail on optional dependency
         pydot_imported_msg = ("Install the python package pydot or pydot-ng."
                               " Install graphviz.")
+    except Exception as e:
+        pydot_imported_msg = "An error happened while importing/trying pydot: "
+        pydot_imported_msg += str(e.args)
 
 
 _logger = logging.getLogger("theano.printing")