numpy · nayyarv · Jan 11, 2016 · Jan 9, 2016 · Jan 9, 2016 · Jan 10, 2016
diff --git a/.gitignore b/.gitignore
@@ -105,6 +105,7 @@ numpy/core/include/numpy/__ufunc_api.h
 numpy/core/include/numpy/_numpyconfig.h
 numpy/version.py
 site.cfg
+setup.cfg
 .tox
 numpy/core/include/numpy/__multiarray_api.c
 numpy/core/include/numpy/__ufunc_api.c

diff --git a/.mailmap b/.mailmap
@@ -10,16 +10,23 @@
 
 Aaron Baecker <abaecker@localhost> abaecker <abaecker@localhost>
 Abdul Muneer <[email protected]> abdulmuneer <[email protected]>
+Adam Ginsburg <[email protected]> Adam Ginsburg <[email protected]>
+Adam Ginsburg <[email protected]> Adam Ginsburg <[email protected]>
 Albert Jornet Puig <[email protected]> jurnix <[email protected]>
 Alex Griffing <[email protected]> alex <[email protected]>
 Alex Griffing <[email protected]> argriffing <[email protected]>
 Alex Griffing <[email protected]> argriffing <[email protected]>
 Alex Griffing <[email protected]> argriffing <[email protected]>
 Alexander Belopolsky <[email protected]> Alexander Belopolsky <[email protected]>
+Alok Singhal <[email protected]> Alok Singhal <[email protected]>
+Alok Singhal <[email protected]> Alok Singhal <[email protected]>
 Amir Sarabadani <[email protected]> amir <[email protected]>
 Anne Archibald <[email protected]> aarchiba <[email protected]>
+Anne Archibald <[email protected]> Anne Archibald <[email protected]>
 Anže Starič <[email protected]> astaric <[email protected]>
 Aron Ahmadia <[email protected]> ahmadia <[email protected]>
+Arun Persaud <[email protected]> Arun Persaud <[email protected]>
+Arun Persaud <[email protected]> Arun Persaud <[email protected]>
 Behzad Nouri <[email protected]> behzad nouri <[email protected]>
 Benjamin Root <[email protected]> Ben Root <[email protected]>
 Benjamin Root <[email protected]> weathergod <?@?>
@@ -28,10 +35,13 @@ Bryan Van de Ven <[email protected]> Bryan Van de Ven <[email protected]>
 Bryan Van de Ven <[email protected]> Bryan Van de Ven <[email protected]>
 Carl Kleffner <[email protected]> carlkl <[email protected]>
 Chris Burns <chris.burns@localhost> chris.burns <chris.burns@localhost>
+Chris Kerr <[email protected]> Chris Kerr <[email protected]>
+Chris Kerr <[email protected]> Chris Kerr <[email protected]>
 Christoph Gohlke <[email protected]> Christolph Gohlke <[email protected]>
 Christoph Gohlke <[email protected]> cgholke <?@?>
 Christoph Gohlke <[email protected]> cgohlke <[email protected]>
 Christopher Hanley <[email protected]> chanley <[email protected]>
+Daniel <[email protected]> Daniel <[email protected]>
 Daniel J Farrell <[email protected]> danieljfarrell <[email protected]>
 Daniel Müllner <Daniel Müllner [email protected]> Daniel <[email protected]>
 Daniel Müllner <Daniel Müllner [email protected]> dmuellner <Daniel Müllner [email protected]>
@@ -44,11 +54,25 @@ Derek Homeier <[email protected]> Derek Homeier <dhomeie@gwdg
 Derek Homeier <[email protected]> Derek Homeir <[email protected]>
 Derek Homeier <[email protected]> Derek Homier <[email protected]>
 Egor Zindy <[email protected]> zindy <[email protected]>
+Eric Fode <[email protected]> Eric Fode <[email protected]>
+Eric Fode <[email protected]> Eric Fode <ericfode@linuxlaptop.(none)>
 Ernest N. Mamikonyan <[email protected]> mamikony <[email protected]>
+Evgeni Burovski <[email protected]> Evgeni Burovski <[email protected]>
+Evgeni Burovski <[email protected]> Evgeni Burovski <[email protected]>
 Evgeny Toder <[email protected]> eltjpm <[email protected]>
 Fernando Perez <[email protected]> Fernando Perez <[email protected]>
 Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
+Gerrit Holl <[email protected]> Gerrit Holl <[email protected]>
+Gerrit Holl <[email protected]> Gerrit Holl <[email protected]>
 Giuseppe Venturini <[email protected]> ggventurini <[email protected]>
+Greg Young <[email protected]> gfyoung <[email protected]>
+Greg Young <[email protected]> gfyoung <[email protected]>
+Jason Grout <[email protected]> Jason Grout <[email protected]>
+Jason Grout <[email protected]> Jason Grout <[email protected]>
+Joseph Martinot-Lagarde <[email protected]> Joseph Martinot-Lagarde <[email protected]>
+Joseph Martinot-Lagarde <[email protected]> Joseph Martinot-Lagarde <[email protected]>
+Julien Lhermitte <[email protected]> Julien Lhermitte <[email protected]>
+Julien Lhermitte <[email protected]> Julien Lhermitte <[email protected]>
 Han Genuit <[email protected]> 87 <[email protected]>
 Han Genuit <[email protected]> Han <[email protected]>
 Han Genuit <[email protected]> [email protected] <[email protected]>
@@ -90,13 +114,17 @@ Ralf Gommers <[email protected]> rgommers <[email protected]>
 Ritta Narita <[email protected]> RittaNarita <[email protected]>
 Robert Kern <[email protected]> Robert Kern <[email protected]>
 Robert LU <[email protected]> RobberPhex <[email protected]>
+Ronan Lamy <[email protected]> Ronan Lamy <[email protected]>
+Ronan Lamy <[email protected]> Ronan Lamy <[email protected]>
 Russell Hewett <[email protected]> rhewett <[email protected]>
 Ryan Blakemore <[email protected]> ryanblak <[email protected]>
 Sam Preston <[email protected]> jspreston <[email protected]>
 Saullo Giovani <[email protected]> saullogiovani <[email protected]>
 Sebastian Berg <[email protected]> seberg <[email protected]>
 Stefan van der Walt <[email protected]> Stefan van der Walt <[email protected]>
 Stefan van der Walt <[email protected]> Stefan van der Walt <[email protected]>
+Stephan Hoyer <[email protected]> Stephan Hoyer <[email protected]>
+Stephan Hoyer <[email protected]> Stephan Hoyer <[email protected]>
 Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 Tim Cera <[email protected]> tim cera <[email protected]>

diff --git a/.travis.yml b/.travis.yml
@@ -20,37 +20,54 @@ 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.5-dev
+  - 3.4
+  - 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:
             - *common_packages
             - python3-dbg
             - python3-dev
             - python3-nose
+            - python3-setuptools
     - 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
+    - python: 3.5
+      env: USE_WHEEL=1
+    - python: 3.5
+      env: USE_SDIST=1
+    - python: 2.7
+      env:
+       - PYTHONOPTIMIZE=2
+       - USE_ASV=1
 before_install:
   - uname -a
   - free -m
@@ -60,6 +77,12 @@ 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.
+  # 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
@@ -68,7 +91,11 @@ 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:
   - ./tools/travis-test.sh
+
+after_success:
+  - ./tools/travis-upload-wheel.sh
diff --git a/COMPATIBILITY b/COMPATIBILITY
diff --git a/DEV_README.txt b/DEV_README.txt