Merge pull request #6101 from nouiz/time_travis2

.travis.yml

@@ -12,7 +12,7 @@ cache:
 language: python
 python:
   - "2.7"
-  - "3.3"
+  - "3.4"
 
 # NB:
 # In before_install and install sections below,
@@ -40,7 +40,7 @@ install:
   - pip install . --no-deps --upgrade
   - pip install flake8-future-import nose-parameterized==0.5.0 sphinx_rtd_theme
   # nose-exclude plugin allow us to tell nosetests to exclude folder with --exclude-dir=path/to/directory.
-  - pip install nose-exclude
+  - pip install nose-exclude nose-timer
 
 # command to run tests
 env:
@@ -54,11 +54,11 @@ env:
 matrix:
   fast_finish: true
   include:
-    - python: "3.3"
+    - python: "3.4"
       env: PART="--exclude-dir=theano/tensor -e test_flake8.py ." THEANO_FLAGS="mode=FAST_COMPILE"
-    - python: "3.3"
+    - python: "3.4"
       env: PART="theano/tensor --exclude-dir=theano/tensor/nnet" THEANO_FLAGS="mode=FAST_COMPILE"
-    - python: "3.3"
+    - python: "3.4"
       env: PART="theano/tensor/nnet" THEANO_FLAGS="mode=FAST_COMPILE"
     - python: "2.7"
       env: PART="--exclude-dir=theano/tensor -e test_flake8.py ." THEANO_FLAGS="mode=FAST_COMPILE,floatX=float32"
@@ -82,7 +82,7 @@ script:
   - cd -; cd Theano
   - python -c 'import theano; print(theano.config.__str__(print_doc=False))'
   - python -c 'import theano; assert(theano.config.blas.ldflags != "")'
-  - theano-nose -v $PART
+  - theano-nose -v --with-timer --timer-top-n 10 $PART
   - if [[ $DOC == "1" ]]; then python doc/scripts/docgen.py --nopdf --check; fi
   - if [[ $DOC == "1" ]]; then python doc/scripts/docgen.py --test --check; fi
 

.travis/travis_install.sh

 #!/usr/bin/env bash
-# In Python 3.3, we test the min version of NumPy and SciPy. In Python 2.7, we test more recent version.
+# In Python 3.4, we test the min version of NumPy and SciPy. In Python 2.7, we test more recent version.
 if test -e $HOME/miniconda2/envs/pyenv; then
     echo "pyenv already exists."
 else
     echo "Creating pyenv."
     if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda create --yes -q -n pyenv python=2.7 ; fi
-    if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then conda create --yes -q -n pyenv python=3.3 ; fi
+    if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then conda create --yes -q -n pyenv python=3.4 ; fi
 fi
 
 source activate pyenv
 if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then conda install --yes -q mkl numpy=1.9.1 scipy=0.14.0 nose=1.3.0 pip flake8=2.3 six=1.9.0 pep8=1.6.2 pyflakes=0.8.1 sphinx=1.5.1 mkl-service libgfortran=1; fi
-if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then conda install --yes -q mkl 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<=1.5.1" mkl-service; fi
+if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then conda install --yes -q mkl 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=1.5.1 mkl-service libgfortran=1; fi
 source deactivate

doc/dev_start_guide.txt

@@ -55,8 +55,8 @@ Requirements for Quality Contributions
 
 * All the code should be properly tested. 
 
-* The code should be compatible with Python 2.7 and above, as well as Python
-  3.3 and above (using `six` if needed).
+* The code should be compatible with Python 2.7 and above, as well as
+  Python 3.4 and above (using `six` if needed).
 
 * All the code should respect the 
   `PEP8 Code Style Guide <http://www.python.org/dev/peps/pep-0008>`_.

doc/faq.txt

@@ -8,7 +8,8 @@ Frequently Asked Questions
 
 Does Theano support Python 3?
 ------------------------------
-We support both Python 2 >= 2.7 and Python 3 >= 3.3.
+
+We support both Python 2 >= 2.7 and Python 3 >= 3.4.
 
 Output slight numerical difference
 ----------------------------------

doc/requirements.inc

@@ -14,10 +14,10 @@ Requirements
 .. _pycuda: https://mathema.tician.de/software/pycuda/
 .. _skcuda: http://scikit-cuda.readthedocs.io/en/latest/
 
-    Python_ == 2.7* or ( >= 3.3 and < 3.6 )
+    Python_ == 2.7* or ( >= 3.4 and < 3.6 )
         |PythonDistRecommended|. 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.
+        release 0.8.2. Python 3.3 was supported up to and including release 0.9.
 
     `NumPy <http://numpy.scipy.org/>`_ >= 1.9.1 <= 1.12
         Earlier versions could work, but we don’t test it.

setup.py

@@ -33,7 +33,6 @@ Operating System :: MacOS
 Programming Language :: Python :: 2
 Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
-Programming Language :: Python :: 3.3
 Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
 """

theano/compile/profiling.py

@@ -93,7 +93,7 @@ def _atexit_print_fn():
                              "linker_make_thunk_time"]:
                     cum_attr = getattr(cum, attr)
                     for key, val in iteritems(getattr(ps, attr)):
-                        assert key not in cum_attr
+                        assert key not in cum_attr, (key, cum_attr)
                         cum_attr[key] = val
 
                 if cum.optimizer_profile and ps.optimizer_profile: