Merge branch 'master' of https://github.com/numpy/numpy

* 'master' of https://github.com/numpy/numpy: (384 commits)
  BUG: fix MANIFEST.in for removal of a file in numpygh-8047.
  DOC: Release notes for Numpy 1.10.2.
  MAINT: remove useless files with outdated info from repo root and doc/.
  MAINT: fix mistake in doc upload rule
  TST: attempt to make test_load_refcount deterministic
  BUG: Fix for numpy#6569, allowing build_ext --inplace
  TST: Added regression test empty percentile, in ref to numpy#6530 and numpy#6553
  TST: Added tests for empty partition and argpartition
  BUG: revert view safety checks
  TST: Remove tests of view safety checks (see next commit)
  BUG: Revert some import * fixes in f2py.
  BUG: Fixed partition errors on empty input. Closes numpy#6530
  DOC: import "numpy for matlab users" from the wiki
  DOC: reorganize user guide a bit + import "tentative numpy tutorial" from wiki
  DOC: remove placeholders and incompleteness warnings
  MAINT: minor update to "make upload" doc build command.
  BUG: error in broadcast_arrays with as_strided array
  BUG: fix inner() by copying if needed to enforce contiguity
  DOC: clarify usage of 'argparse' return value.
  BUG: Make median work for empty arrays (issue numpy#6462)
  ...

Author: tpn

.gitignore

@@ -142,6 +142,9 @@ numpy/core/src/umath/umath_tests.c
 numpy/distutils/__config__.py
 numpy/linalg/umath_linalg.c
 doc/source/reference/generated
+benchmarks/results
+benchmarks/env
+benchmarks/numpy
 # cythonized files
 cythonize.dat
 numpy/random/mtrand/mtrand.c

.mailmap

@@ -1,20 +1,111 @@
 # Prevent git from showing duplicate names with commands like "git shortlog"
-# # See the manpage of git-shortlog for details.
-# # The syntax is:
-# # Name that should be used <email that should be used> Bad name <bad email>
-# #
-# # You can skip Bad name if it is the same as the one that should be used, and is unique.
-# #
-# # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
-# # gives no duplicates.
+# See the manpage of git-shortlog for details.
+# The syntax is:
+# Name that should be used <email that should be used> Bad name <bad email>
+#
+# You can skip Bad name if it is the same as the one that should be used, and is unique.
+#
+# This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
+# gives no duplicates.
 
-Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>
-Ralf Gommers <ralf.gommers@googlemail.com> rgommers <ralf.gommers@googlemail.com>
-Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
+Aaron Baecker <abaecker@localhost> abaecker <abaecker@localhost>
+Abdul Muneer <abdulmuneer@gmail.com> abdulmuneer <abdulmuneer@gmail.com>
+Albert Jornet Puig <albert.jornet@ic3.cat> jurnix <albert.jornet@ic3.cat>
+Alex Griffing <argriffi@ncsu.edu> alex <argriffi@ncsu.edu>
+Alex Griffing <argriffi@ncsu.edu> argriffing <argriffi@ncsu.edu>
+Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@gmail.com>
+Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@users.noreply.github.com>
+Alexander Belopolsky <abalkin@enlnt.com> Alexander Belopolsky <a@enlnt.com>
+Amir Sarabadani <ladsgroup@gmail.com> amir <ladsgroup@gmail.com>
+Anne Archibald <peridot.faceted@gmail.com> aarchiba <peridot.faceted@gmail.com>
+Anže Starič <anze.staric@gmail.com> astaric <anze.staric@gmail.com>
+Aron Ahmadia <aron@ahmadia.net> ahmadia <aron@ahmadia.net>
+Behzad Nouri <behzadnouri@gmail.com> behzad nouri <behzadnouri@gmail.com>
+Benjamin Root <ben.v.root@gmail.com> Ben Root <ben.v.root@gmail.com>
+Benjamin Root <ben.v.root@gmail.com> weathergod <?@?>
+Brett R Murphy <bmurphy@enthought.com> brettrmurphy <bmurphy@enthought.com>
+Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@Laptop-3.local>
+Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@laptop.local>
+Carl Kleffner <cmkleffner@gmail.com> carlkl <cmkleffner@gmail.com>
+Chris Burns <chris.burns@localhost> chris.burns <chris.burns@localhost>
 Christoph Gohlke <cgohlke@uci.edu> Christolph Gohlke <cgohlke@uci.edu>
+Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
 Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
-Ondřej Čertík <ondrej.certik@gmail.com> Ondrej Certik <ondrej.certik@gmail.com>
+Christopher Hanley <chanley@gmail.com> chanley <chanley@gmail.com>
+Daniel J Farrell <danieljfarrel@me.com> danieljfarrell <danieljfarrel@me.com>
+Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> Daniel <muellner@localhost.localdomain>
+Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> dmuellner <Daniel Müllner muellner@math.stanford.edu>
+Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <daniel@meltingwax.net>
+Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <var.mail.daniel@gmail.com>
+David Huard <david.huard@gmail.com> dhuard <dhuard@localhost>
+David M Cooke <cookedm@localhost>  cookedm <cookedm@localhost>
+David Ochoa <ochoadavid@gmail.com> ochoadavid <ochoadavid@gmail.com>
+Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeier <dhomeie@gwdg.de>
+Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeir <derek@astro.phsik.uni-goettingen.de>
+Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homier <derek@astro.physik.uni-goettingen.de>
+Egor Zindy <ezindy@gmail.com> zindy <ezindy@gmail.com>
+Ernest N. Mamikonyan <ernest.mamikonyan@gmail.com> mamikony <ernest.mamikonyan@sig.com>
+Evgeny Toder <evgeny.toder@jpmorgan.com> eltjpm <evgeny.toder@jpmorgan.com>
+Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fperez@fperez.org>
+Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org>
+Giuseppe Venturini <ggventurini@users.noreply.github.com> ggventurini <ggventurini@users.noreply.github.com>
+Han Genuit <hangenuit@gmail.com> 87 <hangenuit@gmail.com>
+Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
+Han Genuit <hangenuit@gmail.com> hangenuit@gmail.com <hangenuit@gmail.com>
+Hanno Klemm <hanno.klemm@maerskoil.com> hklemm <hanno.klemm@maerskoil.com>
+Jaime Fernandez <jaime.frio@gmail.com> Jaime <jaime.frio@gmail.com>
+Jaime Fernandez <jaime.frio@gmail.com> Jaime Fernandez <jaime.fernandez@hp.com>
+Jaime Fernandez <jaime.frio@gmail.com> jaimefrio <jaime.frio@gmail.com>
+Jarrod Millman <millman@berkeley.edu> Jarrod Millman <jarrod.millman@gmail.com>
+Jay Bourque <jay.bourque@continuum.io> jayvius <jay.bourque@continuum.io>
+Jerome Kelleher <jerome.kelleher@ed.ac.uk> jeromekelleher <jerome.kelleher@ed.ac.uk>
+Johannes Schönberger <hannesschoenberger@gmail.com> Johannes Schönberger <jschoenberger@demuc.de>
+Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <jtaylor.debian@googlemail.com>
+Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <juliantaylor108@googlemail.com>
+Lars Buitinck <larsmans@gmail.com> Lars Buitinck <L.J.Buitinck@uva.nl>
+Lars Buitinck <larsmans@gmail.com> Lars Buitinck <l.buitinck@esciencecenter.nl>
+Luis Pedro Coelho <luis@luispedro.org> Luis Pedro Coelho <lpc@cmu.edu>
+Mark DePristo <mdepristo@synapdx.com> markdepristo <mdepristo@synapdx.com>
 Mark Wiebe <mwwiebe@gmail.com> Mark <mwwiebe@gmail.com>
+Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@continuum.io>
 Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@enthought.com>
 Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@georg.(none)>
-Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
+Martin Goodson <martingoodson@gmail.com> martingoodson <martingoodson@gmail.com>
+Martin Teichmann <martin.teichmann@xfel.eu> Martin Teichmann <lkb.teichmann@gmail.com>
+Mattheus Ueckermann <empeeu@yahoo.com> empeeu <empeeu@yahoo.com>
+Michael Droettboom <mdboom@gmail.com> mdroe <mdroe@localhost>
+Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>
+Nicolas Scheffer <nicolas.scheffer@sri.com> Nicolas Scheffer <scheffer@speech.sri.com>
+Ondřej Čertík <ondrej.certik@gmail.com> Ondrej Certik <ondrej.certik@gmail.com>
+Pat Miller <patmiller@localhost> patmiller <patmiller@localhost>
+Paul Ivanov <pi@berkeley.edu> Paul Ivanov <paul.ivanov@local>
+Paul Jacobson <hpj3@myuw.net> hpaulj <hpj3@myuw.net>
+Pearu Peterson <pearu.peterson@gmail.com> Pearu Peterson <pearu@pearu-laptop.(none)>
+Peter J Cock <p.j.a.cock@googlemail.com> peterjc <p.j.a.cock@googlemail.com>
+Pierre GM <pierregmcode@gmail.com> pierregm <pierregm@localhost>
+Pierre GM <pierregmcode@gmail.com> pierregm <pierregmcode@gmail.com>
+Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost>
+Ralf Gommers <ralf.gommers@gmail.com> Ralf Gommers <ralf.gommers@googlemail.com>
+Ralf Gommers <ralf.gommers@gmail.com> rgommers <ralf.gommers@googlemail.com>
+Ritta Narita <narittan@gmail.com> RittaNarita <narittan@gmail.com>
+Robert Kern <rkern@enthought.com> Robert Kern <robert.kern@gmail.com>
+Robert LU <robberphex@gmail.com> RobberPhex <robberphex@gmail.com>
+Russell Hewett <rhewett@mit.edu> rhewett <rhewett@mit.edu>
+Ryan Blakemore <rbtnet@gmail.com> ryanblak <rbtnet@gmail.com>
+Sam Preston <j.sam.preston@gmail.com> jspreston <j.sam.preston@gmail.com>
+Saullo Giovani <saullogiovani@gmail.com> saullogiovani <saullogiovani@gmail.com>
+Sebastian Berg <sebastian@sipsolutions.net> seberg <sebastian@sipsolutions.net>
+Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <sjvdwalt@gmail.com>
+Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <stefan@sun.ac.za>
+Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
+Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
+Tim Cera <tim@cerazone.net> tim cera <tcera@sjrwmd.com>
+Tom Poole <t.b.poole@gmail.com> tpoole <t.b.poole@gmail.com>
+Travis Oliphant <travis@continuum.io> Travis E. Oliphant <teoliphant@gmail.com>
+Travis Oliphant <travis@continuum.io> Travis Oliphant <oliphant@enthought.com>
+Valentin Haenel <valentin@haenel.co> Valentin Haenel <valentin.haenel@gmx.de>
+Warren Weckesser <warren.weckesser@enthought.com> Warren Weckesser <warren.weckesser@gmail.com>
+Wendell Smith <wendellwsmith@gmail.com> Wendell Smith <wackywendell@gmail.com>
+William Spotz <wfspotz@sandia.gov@localhost> wfspotz@sandia.gov <wfspotz@sandia.gov@localhost>
+Åsmund Hjulstad <ahju@statoil.com> Åsmund Hjulstad <asmund@hjulstad.com>
+Óscar Villellas Guillén <oscar.villellas@continuum.io> ovillellas <oscar.villellas@continuum.io>

.travis.yml

@@ -1,25 +1,57 @@
 # 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
+
 python:
   - 2.6
   - 2.7
   - 3.2
   - 3.3
+  - 3.4
+  - 3.5
 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
-      env: NPY_RELAXED_STRIDES_CHECKING=0
-    - python: 2.7
-      env: USE_BENTO=1
+      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
@@ -31,13 +63,12 @@ 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
+  - pip install nose
+  # pip install coverage
   # 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:

BENTO_BUILD.txt

@@ -21,6 +21,11 @@ through our
 [development workflow](http://docs.scipy.org/doc/numpy-dev/dev/gitwash/development_workflow.html)
 
 Either way, please be sure to follow our
-[convention for commit messages](http://docs.scipy.org/doc/numpy-dev/dev/gitwash/development_workflow.html).
+[convention for commit messages](http://docs.scipy.org/doc/numpy-dev/dev/gitwash/development_workflow.html#writing-the-commit-message).
 
+If you are writing new C code, please follow the style described in
+``doc/C_STYLE_GUIDE``.
 
+Suggested ways to work on your development version (compile and run
+the tests without interfering with system packages) are described in
+``doc/source/dev/development_environment.rst``.

COMPATIBILITY

@@ -152,38 +152,6 @@ is broken). gcc 4.4 will hopefully be able to run natively.
 This is the only tested way to get a numpy with a FULL blas/lapack (scipy
 does not work because of C++).
 
-Carl Kleffner's mingw-w64 toolchain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Carl Kleffner has been working on mingw-w64 / OpenBLAS support and has put
-together toolchains for that option. The toolchains are available at 
-https://bitbucket.org/carlkl/mingw-w64-for-python/downloads. The site.cfg
-should be configured like so:
-
-   [openblas]
-   libraries = openblaspy
-   library_dirs = <openblaspath>/lib
-   include_dirs = <openblaspath>/include
-
-The libopenblaspy.dll from <openblaspath>/bin must be copied to numpy/core
-before the build. For this mingw-w64 toolchain manual creation of the python
-import libs is necessary, i.e.:
-
-   gendef python2.7.dll
-   dlltool -D python27.dll -d python27.def -l libpython27.dll.a
-   move libpython27.dll.a libs\libpython27.dll.a
-
-For python-2.6 up to python 3.2 use
-https://bitbucket.org/carlkl/mingw-w64-for-python/downloads/mingwpy_win32_vc90.tar.xz
-or
-https://bitbucket.org/carlkl/mingw-w64-for-python/downloads/mingwpy_amd64_vc90.tar.xz
-
-For python-3.3 and python-3.4 use
-https://bitbucket.org/carlkl/mingw-w64-for-python/downloads/mingwpy_win32_vc100.tar.xz
-or
-https://bitbucket.org/carlkl/mingw-w64-for-python/downloads/mingwpy_amd64_vc100.tar.xz
- 
-
 MS compilers
 ------------
 

CONTRIBUTING.md

@@ -4,12 +4,16 @@
 # data, etc files to distribution. Avoid using MANIFEST.in for that.
 #
 include MANIFEST.in
-include COMPATIBILITY
 include *.txt
 include setupegg.py
 include site.cfg.example
 include numpy/random/mtrand/generate_mtrand_c.py
 recursive-include numpy/random/mtrand *.pyx *.pxd
+# Add build support that should go in sdist, but not go in bdist/be installed
+recursive-include numpy/_build_utils *
+# Add sdist files whose use depends on local configuration.
+include numpy/core/src/multiarray/cblasfuncs.c
+include numpy/core/src/multiarray/python_xerbla.c
 # Adding scons build related files not found by distutils
 recursive-include numpy/core/code_generators *.py *.txt
 recursive-include numpy/core *.in *.h