Merge remote-tracking branch 'numpy-org/master' into mult-norm

1 files changed, 66 insertions, 28 deletions

diff --git a/.travis.yml b/.travis.yml
index 017cf862c..48758bb81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +1,82 @@
 # 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
+
+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
-  - 3.2
-  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
 matrix:
   include:
-    - python: 3.3
-      env: USE_CHROOT=1 ARCH=i386 DIST=trusty PYTHON=3.4
-    - python: 3.2
-      env: USE_DEBUG=1
     - python: 2.7
-      env: NPY_SEPARATE_COMPILATION=0 PYTHON_OO=1
+      env: PY3_COMPATIBILITY_CHECK=1
+    - python: 2.7
+      env: USE_CHROOT=1 ARCH=i386 DIST=trusty PYTHON=2.7
+      sudo: true
+      dist: trusty
+      addons:
+        apt:
+          packages:
+            - debootstrap
     - python: 3.4
-      env: NPY_RELAXED_STRIDES_CHECKING=0
+      env: USE_DEBUG=1
+      sudo: true
+      dist: trusty
+      addons:
+        apt:
+          packages:
+            - *common_packages
+            - cython3-dbg
+            - python3-dbg
+            - python3-dev
+            - python3-nose
+            - python3-setuptools
     - python: 2.7
-      env: USE_BENTO=1
+      env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
     - python: 2.7
       env: USE_WHEEL=1
+    - python: 3.5
+      env: USE_WHEEL=1 RUN_FULL_TESTS=1
+    - python: 3.5
+      env: USE_SDIST=1
+    - python: 2.7
+      env:
+       - 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
-  - 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 --install-option="--no-cython-compile" Cython
-  - sudo apt-get install -qq libatlas-dev libatlas-base-dev gfortran
-  - popd
+  - ./tools/travis-before-install.sh
 
 script:
   - ./tools/travis-test.sh
+
+after_success:
+  - ./tools/travis-upload-wheel.sh