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

.gitignore

@@ -13,6 +13,8 @@
 .*.sw[nop]
 .sw[nop]
 *.tmp
+*.vim
+tags
 
 # Compiled source #
 ###################
@@ -56,6 +58,7 @@ doc/cdoc/build
 *.egg-info
 # The shelf plugin uses this dir
 ./.shelf
+MANIFEST
 
 # Logs and databases #
 ######################
@@ -70,10 +73,12 @@ doc/cdoc/build
 
 # OS generated files #
 ######################
+.DS_Store*
+.VolumeIcon.icns
+.fseventsd
+Icon?
 .gdb_history
-.DS_Store?
 ehthumbs.db
-Icon?
 Thumbs.db
 
 # Things specific to this project #
@@ -86,3 +91,30 @@ numpy/core/include/numpy/__ufunc_api.h
 numpy/core/include/numpy/_numpyconfig.h
 numpy/version.py
 site.cfg
+.tox
+numpy/core/include/numpy/__multiarray_api.c
+numpy/core/include/numpy/__ufunc_api.c
+numpy/core/include/numpy/__umath_generated.c
+numpy/core/include/numpy/config.h
+numpy/core/include/numpy/multiarray_api.txt
+numpy/core/include/numpy/ufunc_api.txt
+numpy/core/lib/
+numpy/core/src/multiarray/arraytypes.c
+numpy/core/src/multiarray/einsum.c
+numpy/core/src/multiarray/lowlevel_strided_loops.c
+numpy/core/src/multiarray/multiarray_tests.c
+numpy/core/src/multiarray/nditer_templ.c
+numpy/core/src/multiarray/scalartypes.c
+numpy/core/src/npymath/ieee754.c
+numpy/core/src/npymath/npy_math.c
+numpy/core/src/npymath/npy_math_complex.c
+numpy/core/src/npysort/heapsort.c
+numpy/core/src/npysort/mergesort.c
+numpy/core/src/npysort/quicksort.c
+numpy/core/src/npysort/sort.c
+numpy/core/src/scalarmathmodule.c
+numpy/core/src/umath/funcs.inc
+numpy/core/src/umath/loops.c
+numpy/core/src/umath/umath_tests.c
+numpy/distutils/__config__.py
+doc/source/reference/generated

.travis-make-py24-virtualenv.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+VIRTENV=$1
+
+set -x
+set -e
+
+curl -O http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tar.bz2
+tar xjf Python-2.4.6.tar.bz2
+cd Python-2.4.6
+cat >setup.cfg <<EOF
+[build_ext]
+library_dirs=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/
+EOF
+./configure --prefix=$PWD/install
+make
+make install
+# This is the last version of virtualenv to support python 2.4:
+curl -O https://raw.github.com/pypa/virtualenv/1.7.2/virtualenv.py
+# And this is the last version of pip to support python 2.4. If
+# there's a file matching "^pip-.*(zip|tar.gz|tar.bz2|tgz|tbz)$" in
+# the current directory then virtualenv will take that as the pip
+# source distribution to install
+curl -O http://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz
+install/bin/python2.4 ./virtualenv.py --distribute $VIRTENV

.travis.yml

@@ -0,0 +1,62 @@
+# After changing this file, check it on:
+#   http://lint.travis-ci.org/
+language: python
+python:
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.1
+  - 3.2
+env:
+  # Hack: 
+  #
+  # We want to test from Python 2.4 to Python 3.2
+  # but Travis doesn't support python 2.4, and never will:
+  #   https://github.com/travis-ci/travis-ci/issues/485
+  #
+  # So what we do is add TEST_PY24=true to the build matrix, and then for that one
+  # version we don't actually use the system python, but instead build 2.4 and
+  # use it.
+  #
+  - TEST_PY24=""
+matrix:
+  include:
+    - python: 2.5
+      env: TEST_PY24="true"
+    - python: 2.7
+      env: NPY_SEPARATE_COMPILATION=1
+    - python: 3.2
+      env: NPY_SEPARATE_COMPILATION=1
+before_install:
+  - mkdir builds
+  - pushd builds
+  # This has to be on a single "virtual line" because of how Travis
+  # munges each line before executing it to print out the exit status.
+  # It's okay for it to be on multiple physical lines, so long as you remember:
+  # - There can't be any leading "-"s
+  # - All newlines will be removed, so use ";"s
+  - if [ "${TEST_PY24}" == "true" ]; then
+      deactivate; 
+      ../.travis-make-py24-virtualenv.sh $PWD/py24-ve;
+      source $PWD/py24-ve/bin/activate;
+      fi
+  - pip install nose
+  # pip install coverage
+  - python -V
+  - popd
+install:
+  - python setup.py install
+script:
+  # We change directories to make sure that python won't find the copy
+  # of numpy in the source directory.
+  - mkdir empty
+  - cd empty
+  - INSTALLDIR=$(python -c "import os; import numpy; print(os.path.dirname(numpy.__file__))")
+  - export PYTHONWARNINGS=default
+  - python ../tools/test-installed-numpy.py
+  # - coverage run --source=$INSTALLDIR --rcfile=../.coveragerc $(which python) ../tools/test-installed-numpy.py
+  # - coverage report --rcfile=../.coveragerc --show-missing
+notifications:
+  # Perhaps we should have status emails sent to the mailing list, but
+  # let's wait to see what people think before turning that on.
+  email: false

README.txt

@@ -16,11 +16,8 @@ After installation, tests can be run with:
 
 python -c 'import numpy; numpy.test()'
 
-When installing a new version of numpy for the first time or before upgrading
-to a newer version, it is recommended to turn on deprecation warnings when
-running the tests:
-
-python -Wd -c 'import numpy; numpy.test()'
+Starting in NumPy 1.7, deprecation warnings have been set to 'raise' by
+default, so the -Wd command-line option is no longer necessary.
 
 The most current development version is always available from our
 git repository:

TEST_COMMIT

@@ -1,5 +1,5 @@
 oliphant: yes
-
+stefanv: yes
 rkern: yes
 pearu: yes
 fperez: yes
@@ -15,3 +15,4 @@ sasha: yes
 tim_hochberg: yes
 jarrod.millman: yes
 ariver: 2010-01-14 20:02:18
+rgommers: test build bot v3

bento.info

@@ -56,22 +56,29 @@ DataFiles: tests
     TargetDir: $sitedir/numpy
     SourceDir: numpy
     Files:
-        core/tests/*.py,
-        distutils/tests/*.py,
-        f2py/tests/*.py,
-        fft/tests/*.py,
-        lib/tests/*.py,
-        linalg/tests/*.py,
-        ma/tests/*.py,
-        matrixlib/tests/*.py,
-        oldnumeric/tests/*.py,
-        polynomial/tests/*.py,
-        random/tests/*.py,
-        testing/tests/*.py
+        **/tests/*.py,
+        core/tests/data/*.fits,
+        core/tests/data/*.pkl,
+        f2py/tests/src/array_from_pyobj/*.c,
+        f2py/src/test/*.c,
+        f2py/src/test/*.f,
+        f2py/src/test/*.f90
 
-HookFile: bscript
+DataFiles: f2py-data
+    TargetDir: $sitedir
+    Files:
+        numpy/f2py/src/fortranobject.*
 
+DataFiles: numpy-includes
+    TargetDir: $sitedir
+    Files:
+        numpy/core/include/numpy/*.h,
+        numpy/core/include/numpy/fenv/*.h
+
+HookFile: bscript
+MetaTemplateFiles: numpy/version.py.in, numpy/__config__.py.in
 Recurse: numpy
+UseBackends: Waf
 
 Library:
     Packages: