Merge pull request #1668 from ColCarroll/bump_test_versions

Bump to python 3.6

.travis.yml

@@ -16,9 +16,9 @@ env:
   - PYTHON_VERSION=2.7 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 -e test_examples -e test_distributions"
   - PYTHON_VERSION=2.7 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 pymc3.tests.test_distributions pymc3.tests.test_examples"
   - PYTHON_VERSION=2.7 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 pymc3.tests.test_distributions_random"
-  - PYTHON_VERSION=3.5 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 -e test_examples -e test_distributions"
-  - PYTHON_VERSION=3.5 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 pymc3.tests.test_distributions pymc3.tests.test_examples"
-  - PYTHON_VERSION=3.5 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 pymc3.tests.test_distributions_random"
+  - PYTHON_VERSION=3.6 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 -e test_examples -e test_distributions"
+  - PYTHON_VERSION=3.6 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 pymc3.tests.test_distributions pymc3.tests.test_examples"
+  - PYTHON_VERSION=3.6 TESTCMD=" -vv --with-timer --with-coverage --cover-package=pymc3 pymc3.tests.test_distributions_random"
 script:
   - . ./scripts/test.sh $TESTCMD
 

README.rst

@@ -34,7 +34,7 @@ Features
 Getting started
 ---------------
 
--  The `PyMC3 tutorial <http://pymc-devs.github.io/pymc3/notebooks/getting_started.html>`__ 
+-  The `PyMC3 tutorial <http://pymc-devs.github.io/pymc3/notebooks/getting_started.html>`__
 -  `PyMC3 examples <http://pymc-devs.github.io/pymc3/examples.html>`__
    and the `API reference <http://pymc-devs.github.io/pymc3/api.html>`__
 -  `Probabilistic Programming and Bayesian Methods for Hackers <https://github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers>`__
@@ -93,7 +93,7 @@ Another option is to clone the repository and install PyMC3 using
 Dependencies
 ------------
 
-PyMC3 is tested on Python 2.7 and 3.5 and depends on Theano, NumPy,
+PyMC3 is tested on Python 2.7 and 3.6 and depends on Theano, NumPy,
 SciPy, Pandas, and Matplotlib (see ``requirements.txt`` for version
 information).
 
@@ -154,9 +154,8 @@ Sponsors
 .. |Build Status| image:: https://travis-ci.org/pymc-devs/pymc3.png?branch=master
    :target: https://travis-ci.org/pymc-devs/pymc3
 .. |Coverage| image:: https://coveralls.io/repos/github/pymc-devs/pymc3/badge.svg?branch=master
-   :target: https://coveralls.io/github/pymc-devs/pymc3?branch=master 
+   :target: https://coveralls.io/github/pymc-devs/pymc3?branch=master
 .. |NumFOCUS| image:: http://www.numfocus.org/uploads/6/0/6/9/60696727/1457562110.png
    :target: http://www.numfocus.org/
 .. |Quantopian| image:: https://raw.githubusercontent.com/pymc-devs/pymc3/master/docs/quantopianlogo.jpg
    :target: https://quantopian.com
-

scripts/create_testenv.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e # fail on first error
+set -ex # fail on first error, print commands
 
 while test $# -gt 0
 do
@@ -15,15 +15,17 @@ do
     shift
 done
 
-PYTHON_VERSION=${PYTHON_VERSION:-3.5} # if no python specified, use 3.5
+PYTHON_VERSION=${PYTHON_VERSION:-3.6} # if no python specified, use 3.6
 
 if [ -z ${GLOBAL} ]
 then
     conda create -n testenv --yes pip python=${PYTHON_VERSION}
     source activate testenv
 fi
 
-conda install --yes pyqt=4.11.4 jupyter pyzmq numpy scipy nose matplotlib pandas Cython patsy statsmodels joblib coverage mkl-service
+pip install jupyter
+conda install --yes pyqt matplotlib --channel conda-forge
+conda install --yes pyzmq numpy scipy nose pandas Cython patsy statsmodels joblib coverage mkl-service
 if [ ${PYTHON_VERSION} == "2.7" ]; then
     conda install --yes mock enum34;
 fi

scripts/install_miniconda.sh

@@ -7,7 +7,7 @@ if conda --version > /dev/null 2>&1; then
    exit 0
  fi
 
-PYTHON_VERSION=${PYTHON_VERSION:-3.5} # if no python specified, use 3.5
+PYTHON_VERSION=${PYTHON_VERSION:-3.6} # if no python specified, use 3.6
 
 if [ "$(uname)" == "Darwin" ]; then
   URL_OS="MacOSX"

setup.py

@@ -21,6 +21,7 @@
                'Programming Language :: Python :: 2.7',
                'Programming Language :: Python :: 3.4',
                'Programming Language :: Python :: 3.5',
+               'Programming Language :: Python :: 3.6',
                'License :: OSI Approved :: Apache Software License',
                'Intended Audience :: Science/Research',
                'Topic :: Scientific/Engineering',