From ea0744b6fa18b27de2986a2240d1d2fd33085b85 Mon Sep 17 00:00:00 2001
From: "Nathaniel J. Smith" <njs@pobox.com>
Date: Wed, 24 Jun 2015 17:22:41 -0700
Subject: MAINT: add 'nightly' (= 3.5ish) to travis build matrix

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 017cf862c..607248d4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - 2.7
   - 3.2
   - 3.3
+  - nightly
 matrix:
   include:
     - python: 3.3
-- 
cgit v1.2.1


From 5bc74aae6f218ad6f0cba5e7ca5250028febb50c Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Fri, 24 Jul 2015 21:06:19 -0600
Subject: MAINT: Use Python 3.5-dev instead of nightly.

Python 3.6-dev has broken the nose tester. Use an earlier version
until that gets fixed upstream.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 607248d4d..6d207551c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
   - 2.7
   - 3.2
   - 3.3
-  - nightly
+  - 3.5-dev
 matrix:
   include:
     - python: 3.3
-- 
cgit v1.2.1


From 05010d652d1e2abfa13b4c2c9fa8f5eb48acf4bc Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Wed, 5 Aug 2015 13:33:44 +0100
Subject: BLD: Speed up up Travis jobs by running on container-based
 infrastructure

All jobs currently run on Travis's legacy infrastructure - which supports sudo.
The newer container-based infrastructure is faster, but doesn't allow sudo.

This patch
 - sets sudo=false for all jobs, except the chroot job
 - uses Travis's apt addon to install all packages
 - installs eatmydata for all jobs to reduce disk IO
 - removes the tmpfs workaround for chroot builds
---
 .travis.yml | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 6d207551c..d7874a1fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,21 @@
 # After changing this file, check it on:
 #   http://lint.travis-ci.org/
 language: python
+
+# Run jobs on container-based infrastructure, can be overridden per job
+sudo: false
+
+# Travis whitelists the installable packages, additions can be requested
+#   https://github.com/travis-ci/apt-package-whitelist
+addons:
+  apt:
+    packages: &common_packages
+      - gfortran
+      - libatlas-dev
+      - libatlas-base-dev
+      # Speedup builds, particularly when USE_CHROOT=1
+      - eatmydata
+
 python:
   - 2.6
   - 2.7
@@ -11,8 +26,21 @@ matrix:
   include:
     - python: 3.3
       env: USE_CHROOT=1 ARCH=i386 DIST=trusty PYTHON=3.4
+      sudo: true
+      addons:
+        apt:
+          packages:
+            - *common_packages
+            - debootstrap
     - python: 3.2
       env: USE_DEBUG=1
+      addons:
+        apt:
+          packages:
+            - *common_packages
+            - python3-dbg
+            - python3-dev
+            - python3-nose
     - python: 2.7
       env: NPY_SEPARATE_COMPILATION=0 PYTHON_OO=1
     - python: 3.4
@@ -38,7 +66,6 @@ before_install:
   - pip install --upgrade pip setuptools
   # Speed up install by not compiling Cython
   - pip install --install-option="--no-cython-compile" Cython
-  - sudo apt-get install -qq libatlas-dev libatlas-base-dev gfortran
   - popd
 
 script:
-- 
cgit v1.2.1


From b4ee7287c8a260c5ca4325b63325b6e66647c08b Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Wed, 5 Aug 2015 13:38:49 +0100
Subject: BLD: Cache pip downloads on Travis

This enables the cache feature of Travis container-based ingrastructure.
Pip's download/build cache is preserved between jobs, speeding up the
install phase.
Installation of nose etc is moved to after pip has been upgraded so that
wheels are favoured.
Sadly this has no effect on Cython - it's still built from source every time.
---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index d7874a1fb..b31249a88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,10 @@ addons:
       # Speedup builds, particularly when USE_CHROOT=1
       - eatmydata
 
+cache:
+  directories:
+    - $HOME/.cache/pip
+
 python:
   - 2.6
   - 2.7
@@ -60,11 +64,11 @@ before_install:
   # We therefore control our own environment, avoid travis' numpy
   - virtualenv --python=python venv
   - source venv/bin/activate
-  - pip install nose
-  # pip install coverage
   - python -V
   - pip install --upgrade pip setuptools
   # Speed up install by not compiling Cython
+  - pip install nose
+  # pip install coverage
   - pip install --install-option="--no-cython-compile" Cython
   - popd
 
-- 
cgit v1.2.1


From 4d84ac10bd07c95c25ddd68a3d65e811fe27e5a5 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Wed, 5 Aug 2015 15:53:32 +0100
Subject: MAINT: Restore Cython comment to it's correct place

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index b31249a88..ff5cf98a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,9 +66,9 @@ before_install:
   - source venv/bin/activate
   - python -V
   - pip install --upgrade pip setuptools
-  # Speed up install by not compiling Cython
   - pip install nose
   # pip install coverage
+  # Speed up install by not compiling Cython
   - pip install --install-option="--no-cython-compile" Cython
   - popd
 
-- 
cgit v1.2.1


From 0648d9f3b4894571968cac5439129331527835a8 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Wed, 19 Aug 2015 10:11:50 -0600
Subject: MAINT,TST: Remove Bento from the travis ci testing.

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index ff5cf98a0..5d5c149b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,8 +49,6 @@ matrix:
       env: NPY_SEPARATE_COMPILATION=0 PYTHON_OO=1
     - python: 3.4
       env: NPY_RELAXED_STRIDES_CHECKING=0
-    - python: 2.7
-      env: USE_BENTO=1
     - python: 2.7
       env: USE_WHEEL=1
 before_install:
-- 
cgit v1.2.1


From 60ca6346918d4a716f2d81ebeca930fbf4b6c190 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Thu, 8 Oct 2015 14:39:50 -0600
Subject: TST: Remove single file compilation test from travis ci.

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 5d5c149b4..7074e7ada 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ python:
   - 2.7
   - 3.2
   - 3.3
+  - 3.4
   - 3.5-dev
 matrix:
   include:
@@ -46,9 +47,7 @@ matrix:
             - python3-dev
             - python3-nose
     - python: 2.7
-      env: NPY_SEPARATE_COMPILATION=0 PYTHON_OO=1
-    - python: 3.4
-      env: NPY_RELAXED_STRIDES_CHECKING=0
+      env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
     - python: 2.7
       env: USE_WHEEL=1
 before_install:
-- 
cgit v1.2.1


From 034c2e67b111da24a6c8f92578377e65410f42e9 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Wed, 14 Oct 2015 11:57:06 -0600
Subject: MAINT: Use Python 3.5 instead of 3.5-dev for travis 3.5 testing.

Python 3.5 has been released, so update 3.5 testing version.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 7074e7ada..64ed69aa8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ python:
   - 3.2
   - 3.3
   - 3.4
-  - 3.5-dev
+  - 3.5
 matrix:
   include:
     - python: 3.3
-- 
cgit v1.2.1


From ac4433cf550762f53459d330c41a98178a4f9713 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 19 Oct 2015 12:47:50 -0700
Subject: Do a TravisCI build with PYTHONOPTIMIZE=2

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 64ed69aa8..2447360f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,8 @@ matrix:
       env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
     - python: 2.7
       env: USE_WHEEL=1
+    - python: 2.7
+      env: PYTHONOPTIMIZE=2
 before_install:
   - uname -a
   - free -m
-- 
cgit v1.2.1


From 27abfb4923a3ff0433bb7f5dd08a42603641b519 Mon Sep 17 00:00:00 2001
From: Olivier Grisel <olivier.grisel@ensta.org>
Date: Thu, 3 Dec 2015 16:29:22 +0100
Subject: ENH deploy dev wheels to rackspace

---
 .travis.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2447360f5..314fd18d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,13 @@ matrix:
             - python3-nose
     - python: 2.7
       env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
-    - python: 2.7
-      env: USE_WHEEL=1
+    - python: 3.5
+      env:
+       - USE_WHEEL=1
+       - WHEELHOUSE_UPLOADER_USERNAME=travis.numpy
+       # The following is generated with the command:
+       # travis encrypt -r numpy/numpy WHEELHOUSE_UPLOADER_SECRET=tH3AP1KeY
+       - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9TrXrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPowiFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAMahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
     - python: 2.7
       env: PYTHONOPTIMIZE=2
 before_install:
@@ -73,3 +78,6 @@ before_install:
 
 script:
   - ./tools/travis-test.sh
+
+after_success:
+  - ./tools/travis-upload-wheel.sh
-- 
cgit v1.2.1


From f0d6d470c13405f9643f8bde50da74170b66c5c0 Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Mon, 14 Dec 2015 01:01:51 +0200
Subject: CI: run benchmark suite in travis-CI

This should ensure the suite stays in working condition, not to produce
reliable timing information.
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 314fd18d5..f14b9c912 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,9 @@ matrix:
        # travis encrypt -r numpy/numpy WHEELHOUSE_UPLOADER_SECRET=tH3AP1KeY
        - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9TrXrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPowiFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAMahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
     - python: 2.7
-      env: PYTHONOPTIMIZE=2
+      env:
+       - PYTHONOPTIMIZE=2
+       - USE_ASV=1
 before_install:
   - uname -a
   - free -m
@@ -74,6 +76,7 @@ before_install:
   # pip install coverage
   # Speed up install by not compiling Cython
   - pip install --install-option="--no-cython-compile" Cython
+  - if [ -n "$USE_ASV" ]; then pip install asv; fi
   - popd
 
 script:
-- 
cgit v1.2.1


From 293e930ad4be772ec07f2777527f1d211257c3b5 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Tue, 15 Dec 2015 14:48:00 -0700
Subject: TST: Clean up travis-test and make it work with current travis ci.

Travis ci is migrating to GCI and the 32 bit tests broke in the process.
This cleans up the tools/travis-test script, fixes it for current
travis, and changes the 32 bit test to use python 2.7 in order to turn
up errors involving python long integers.

In preparation for dropping Python 3.2 and 3.3, the USE_DEBUG test is
run in the travis ci trusty beta so that python3 defaults to 3.4.
---
 .travis.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index f14b9c912..589d7a9e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,16 +29,18 @@ python:
   - 3.5
 matrix:
   include:
-    - python: 3.3
-      env: USE_CHROOT=1 ARCH=i386 DIST=trusty PYTHON=3.4
+    - python: 2.7
+      env: USE_CHROOT=1 ARCH=i386 DIST=trusty PYTHON=2.7
       sudo: true
+      dist: trusty
       addons:
         apt:
           packages:
-            - *common_packages
             - debootstrap
-    - python: 3.2
+    - python: 3.4
       env: USE_DEBUG=1
+      sudo: true
+      dist: trusty
       addons:
         apt:
           packages:
-- 
cgit v1.2.1


From 8f87f431e275c243d17857ba7a027102dd81cfe8 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Wed, 16 Dec 2015 12:54:23 -0700
Subject: STY: Style fixes for .travis.yml and travis-upload-wheel.sh

* shell script style fixes inspired by google shell style guide
  https://google.github.io/styleguide/shell.xml
* .travis.yml longline breaking tested with
  http://yaml-online-parser.appspot.com/
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 589d7a9e6..e0887a82a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,10 @@ matrix:
        - WHEELHOUSE_UPLOADER_USERNAME=travis.numpy
        # The following is generated with the command:
        # travis encrypt -r numpy/numpy WHEELHOUSE_UPLOADER_SECRET=tH3AP1KeY
-       - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9TrXrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPowiFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAMahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
+       - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9Tr\
+                  XrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPow\
+                  iFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAM\
+                  ahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
     - python: 2.7
       env:
        - PYTHONOPTIMIZE=2
-- 
cgit v1.2.1


From 4b43d20fec0eda4a8f02e843b3e6e454bb243f49 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Tue, 29 Dec 2015 17:24:51 +0100
Subject: BUG: fix TravisCI test issues when using setuptools unconditionally.

Also remove all mentions of setupegg.py from the documentation.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e0887a82a..1832e317c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,7 @@ matrix:
             - python3-dbg
             - python3-dev
             - python3-nose
+            - python3-setuptools
     - python: 2.7
       env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
     - python: 3.5
-- 
cgit v1.2.1


From 363c5021f7428f19a56cd081a5475e9d2b5e884d Mon Sep 17 00:00:00 2001
From: Olivier Grisel <olivier.grisel@ensta.org>
Date: Sat, 16 Jan 2016 19:21:27 +0100
Subject: BLD: build travis dev wheels for py27

---
 .travis.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 1832e317c..3066cbbaa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,16 @@ cache:
   directories:
     - $HOME/.cache/pip
 
+env:
+  global:
+    - WHEELHOUSE_UPLOADER_USERNAME=travis.numpy
+    # The following is generated with the command:
+    # travis encrypt -r numpy/numpy WHEELHOUSE_UPLOADER_SECRET=tH3AP1KeY
+    - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9Tr\
+               XrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPow\
+               iFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAM\
+               ahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
+
 python:
   - 2.6
   - 2.7
@@ -51,16 +61,10 @@ matrix:
             - python3-setuptools
     - python: 2.7
       env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
+    - python: 2.7
+      env: USE_WHEEL=1
     - python: 3.5
-      env:
-       - USE_WHEEL=1
-       - WHEELHOUSE_UPLOADER_USERNAME=travis.numpy
-       # The following is generated with the command:
-       # travis encrypt -r numpy/numpy WHEELHOUSE_UPLOADER_SECRET=tH3AP1KeY
-       - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9Tr\
-                  XrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPow\
-                  iFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAM\
-                  ahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
+      env: USE_WHEEL=1
     - python: 2.7
       env:
        - PYTHONOPTIMIZE=2
-- 
cgit v1.2.1


From 11a9b710481f5932835c1c0cb1e5e2747be8cde0 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Tue, 19 Jan 2016 19:53:20 -0700
Subject: REL: Update master branch after 1.12.x branch has been made.

* Drop testing of Python 2.6, 3.2, and 3.3
* Create 1.12.0-notes.rst and add to source/documentation.
* Update pavement.py to use 1.10.x as LOG_START
* Update version numpy in setup.py
---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 3066cbbaa..c14994d0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,7 @@ env:
                ahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
 
 python:
-  - 2.6
   - 2.7
-  - 3.2
-  - 3.3
   - 3.4
   - 3.5
 matrix:
-- 
cgit v1.2.1


From 2a079b2d39ea71938912528cbe9d679649bf77b9 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@googlemail.com>
Date: Wed, 27 Jan 2016 21:33:12 +0100
Subject: TST: test installing from sdist on TravisCI.

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index c14994d0d..ccb182816 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,8 @@ matrix:
       env: USE_WHEEL=1
     - python: 3.5
       env: USE_WHEEL=1
+    - python: 3.5
+      env: USE_SDIST=1
     - python: 2.7
       env:
        - PYTHONOPTIMIZE=2
-- 
cgit v1.2.1


From 4db3e19312483351d545f64bcb45fdcda278490c Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Fri, 5 Feb 2016 14:44:54 -0500
Subject: TST: Pin virtualenv used on Travis CI. [skip appveyor]

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index ccb182816..540d05c56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,6 +77,10 @@ before_install:
   - pushd builds
   # Build into own virtualenv
   # We therefore control our own environment, avoid travis' numpy
+  #
+  # Some change in virtualenv 14.0.5 caused `test_f2py` to fail. So, we have
+  # pinned `virtualenv` to the last known working version to avoid this failure.
+  - pip install -U 'virtualenv==14.0.4'
   - virtualenv --python=python venv
   - source venv/bin/activate
   - python -V
-- 
cgit v1.2.1


From 5c616fba2949714b2740f9d299c1f25de3554784 Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Mon, 8 Feb 2016 01:42:12 -0500
Subject: TST: Bump `virtualenv` to 14.0.6.

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 540d05c56..040d7362e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,7 +80,9 @@ before_install:
   #
   # Some change in virtualenv 14.0.5 caused `test_f2py` to fail. So, we have
   # pinned `virtualenv` to the last known working version to avoid this failure.
-  - pip install -U 'virtualenv==14.0.4'
+  # Appears we had some issues with certificates on Travis. It looks like
+  # bumping to 14.0.6 will help.
+  - pip install -U 'virtualenv==14.0.6'
   - virtualenv --python=python venv
   - source venv/bin/activate
   - python -V
-- 
cgit v1.2.1


From 16416f0143c9a1213d5d141cc229e740c0e01572 Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Thu, 25 Feb 2016 00:41:12 -0500
Subject: TST: Install `pytz` in the CI.

This should allow for some tests that require `pytz` to run during CI.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 040d7362e..4bfe02ce8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,6 +88,7 @@ before_install:
   - python -V
   - pip install --upgrade pip setuptools
   - pip install nose
+  - pip install pytz
   # pip install coverage
   # Speed up install by not compiling Cython
   - pip install --install-option="--no-cython-compile" Cython
-- 
cgit v1.2.1


From ef8253f0076b8955aa3025a3651f07d61b14ea5c Mon Sep 17 00:00:00 2001
From: Olivier Grisel <olivier.grisel@ensta.org>
Date: Thu, 21 Apr 2016 18:31:31 +0200
Subject: MAINT: use manylinux1 wheel for cython

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 4bfe02ce8..fee1e72ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,11 +87,7 @@ before_install:
   - source venv/bin/activate
   - python -V
   - pip install --upgrade pip setuptools
-  - pip install nose
-  - pip install pytz
-  # pip install coverage
-  # Speed up install by not compiling Cython
-  - pip install --install-option="--no-cython-compile" Cython
+  - pip install nose pytz cython
   - if [ -n "$USE_ASV" ]; then pip install asv; fi
   - popd
 
-- 
cgit v1.2.1


From 2dc070d3b7c1aa5d6e0b3509078c358192627132 Mon Sep 17 00:00:00 2001
From: Sebastian Berg <sebastian@sipsolutions.net>
Date: Sat, 30 Jan 2016 12:06:17 +0100
Subject: TST: Make one 3.5 test run the full test suit.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index fee1e72ee..7d503b8c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ matrix:
     - python: 2.7
       env: USE_WHEEL=1
     - python: 3.5
-      env: USE_WHEEL=1
+      env: USE_WHEEL=1 RUN_FULL_TESTS=1
     - python: 3.5
       env: USE_SDIST=1
     - python: 2.7
-- 
cgit v1.2.1


From 7fdfa6b2c0a5da5115c523c6869898873050e41c Mon Sep 17 00:00:00 2001
From: gfyoung <gfyoung17@gmail.com>
Date: Tue, 20 Sep 2016 11:20:42 -0400
Subject: MAINT: Add Tempita to randint helpers

Refactors the randint helpers to use a Tempita
template. This will reduce technical debt in the
long run.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 7d503b8c5..47a6bc171 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,6 +52,7 @@ matrix:
         apt:
           packages:
             - *common_packages
+            - cython3-dbg
             - python3-dbg
             - python3-dev
             - python3-nose
-- 
cgit v1.2.1


From 1a987606958b5b5073557b83ba8bfe8dfe9b14d8 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Wed, 19 Oct 2016 10:37:23 -0600
Subject: TST: Start testing with Python 2.6 development releases.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 47a6bc171..58fc8415e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ python:
   - 2.7
   - 3.4
   - 3.5
+  - 3.6-dev
 matrix:
   include:
     - python: 2.7
-- 
cgit v1.2.1


From 52f761d6ee094a8dde25ffc9e4c08dad51b61ae0 Mon Sep 17 00:00:00 2001
From: gfyoung <gfyoung17@gmail.com>
Date: Wed, 8 Jun 2016 13:46:32 +0100
Subject: BUG, TST: Fix python3-dbg bug in Travis script

With USE_DEBUG=1, the wrong python was being used
to create the virtualenv, meaning that installed
packages (e.g. Cython) were being installed to
the wrong location.
---
 .travis.yml | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 58fc8415e..5f5bf9757 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,27 +71,7 @@ matrix:
        - PYTHONOPTIMIZE=2
        - USE_ASV=1
 before_install:
-  - uname -a
-  - free -m
-  - df -h
-  - ulimit -a
-  - mkdir builds
-  - pushd builds
-  # Build into own virtualenv
-  # We therefore control our own environment, avoid travis' numpy
-  #
-  # Some change in virtualenv 14.0.5 caused `test_f2py` to fail. So, we have
-  # pinned `virtualenv` to the last known working version to avoid this failure.
-  # Appears we had some issues with certificates on Travis. It looks like
-  # bumping to 14.0.6 will help.
-  - pip install -U 'virtualenv==14.0.6'
-  - virtualenv --python=python venv
-  - source venv/bin/activate
-  - python -V
-  - pip install --upgrade pip setuptools
-  - pip install nose pytz cython
-  - if [ -n "$USE_ASV" ]; then pip install asv; fi
-  - popd
+  - ./tools/travis-before-install.sh
 
 script:
   - ./tools/travis-test.sh
-- 
cgit v1.2.1


From f685f1a83de2d8fc1e0f48167a204248b6656a63 Mon Sep 17 00:00:00 2001
From: saurabh <e.samehta@gmail.com>
Date: Tue, 1 Nov 2016 02:28:33 +0100
Subject: ENH: Deprecation warnings for `/` integer division when running
 python -3

When python is invoked with switch -3, it emits waring "classic int division"
for strict integer divisions. The same behavior is now implemented to numpy
with this fix
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 5f5bf9757..ba226fcb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,8 @@ python:
   - 3.6-dev
 matrix:
   include:
+    - python: 2.7
+      env: PY3_COMPATIBILITY_CHECK=1
     - python: 2.7
       env: USE_CHROOT=1 ARCH=i386 DIST=trusty PYTHON=2.7
       sudo: true
-- 
cgit v1.2.1


From 8fbbd252be29db194347ebee1cd822f5909173a9 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Sat, 31 Dec 2016 14:30:32 -0700
Subject: TST: Update 3.6-dev tests to 3.6 after Python final release.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index ba226fcb2..48758bb81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ python:
   - 2.7
   - 3.4
   - 3.5
-  - 3.6-dev
+  - 3.6
 matrix:
   include:
     - python: 2.7
-- 
cgit v1.2.1