[Numpy-svn] [numpy/numpy] 66bd39: BLD: fix Bento and Numscons builds, that were brok...

Wed Jul 18 01:30:11 EDT 2012

  Branch: refs/heads/maintenance/1.7.x
  Home:   https://github.com/numpy/numpy
  Commit: 66bd39f021007cbade675cb6944441bcb5737ea5
      https://github.com/numpy/numpy/commit/66bd39f021007cbade675cb6944441bcb5737ea5
  Author: Ralf Gommers <ralf.gommers at googlemail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M numpy/core/SConscript
    M numpy/core/bscript

  Log Message:
  -----------
  BLD: fix Bento and Numscons builds, that were broken in b272bc60.

(backported from 699c2f3)

  Commit: 7316499dd60baa7bb260875b79f7d22be491c986
      https://github.com/numpy/numpy/commit/7316499dd60baa7bb260875b79f7d22be491c986
  Author: ahmadia <aron at ahmadia.net>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M numpy/distutils/fcompiler/__init__.py

  Log Message:
  -----------
  prefer gfortran (g95) over vendor compilers, g77 and g95 on OSX and Linux.  

Retain preference for g77 on Windows and vendor compilers on other platforms. 

  Commit: 684751304f4d8bec77c705a0f30489e33a55b3e6
      https://github.com/numpy/numpy/commit/684751304f4d8bec77c705a0f30489e33a55b3e6
  Author: Ondrej Certik <ondrej.certik at gmail.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    A doc/release/1.7.0-notes.rst
    R doc/release/2.0.0-notes.rst

  Log Message:
  -----------
  DOC: Rename the release notes to 1.7.0-notes.rst

  Commit: 3a56f5c59759423ca7e9f8b3d3150932009934f6
      https://github.com/numpy/numpy/commit/3a56f5c59759423ca7e9f8b3d3150932009934f6
  Author: Ondrej Certik <ondrej.certik at gmail.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M doc/release/1.7.0-notes.rst

  Log Message:
  -----------
  DOC: Improve the release notes for 1.7.0

Besides a few fixes here and there, the following changes were done:

* Add a note about C_STYLE_GUIDE.rst.txt
* Add a link to arrays.datetime.rst for now
* Add more highlights (thanks to @rgommers)
* Mention the 'formatter' argument
* Mention business day functionality
* Improve and merge the two datetime sections

  Commit: 95c84bfce5610b4cc122541f7cb155a56cf321f9
      https://github.com/numpy/numpy/commit/95c84bfce5610b4cc122541f7cb155a56cf321f9
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    A doc/release/1.7.0-notes.rst
    R doc/release/2.0.0-notes.rst

  Log Message:
  -----------
  Merge pull request #318 from certik/ondrej1

Release notes

  Commit: a419a3036aa8202d00eb6e857c79d66adc56bed0
      https://github.com/numpy/numpy/commit/a419a3036aa8202d00eb6e857c79d66adc56bed0
  Author: Aron Ahmadia <aron at ahmadia.net>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M .gitignore
    M doc/TESTS.rst.txt
    A doc/release/1.7.0-notes.rst
    M doc/source/dev/gitwash/development_setup.rst
    M doc/source/reference/c-api.array.rst
    M doc/source/reference/index.rst
    M doc/source/reference/routines.matlib.rst
    M doc/source/reference/routines.polynomials.rst
    M doc/source/reference/routines.random.rst
    M doc/source/reference/routines.statistics.rst
    M numpy/add_newdocs.py
    M numpy/core/SConscript
    M numpy/core/bento.info
    M numpy/core/code_generators/cversions.txt
    M numpy/core/code_generators/numpy_api.py
    M numpy/core/defchararray.py
    M numpy/core/fromnumeric.py
    M numpy/core/include/numpy/ndarrayobject.h
    M numpy/core/include/numpy/ndarraytypes.h
    M numpy/core/include/numpy/npy_3kcompat.h
    M numpy/core/include/numpy/npy_common.h
    M numpy/core/memmap.py
    M numpy/core/numeric.py
    M numpy/core/setup.py
    M numpy/core/shape_base.py
    M numpy/core/src/dummymodule.c
    M numpy/core/src/multiarray/array_assign.c
    M numpy/core/src/multiarray/array_assign_array.c
    M numpy/core/src/multiarray/array_assign_scalar.c
    M numpy/core/src/multiarray/arrayobject.c
    M numpy/core/src/multiarray/arraytypes.c.src
    M numpy/core/src/multiarray/buffer.c
    M numpy/core/src/multiarray/calculation.c
    M numpy/core/src/multiarray/common.c
    M numpy/core/src/multiarray/conversion_utils.c
    M numpy/core/src/multiarray/convert.c
    M numpy/core/src/multiarray/convert_datatype.c
    M numpy/core/src/multiarray/ctors.c
    M numpy/core/src/multiarray/datetime.c
    M numpy/core/src/multiarray/datetime_busday.c
    M numpy/core/src/multiarray/datetime_busdaycal.c
    M numpy/core/src/multiarray/datetime_strings.c
    M numpy/core/src/multiarray/descriptor.c
    M numpy/core/src/multiarray/dtype_transfer.c
    M numpy/core/src/multiarray/einsum.c.src
    M numpy/core/src/multiarray/flagsobject.c
    M numpy/core/src/multiarray/getset.c
    M numpy/core/src/multiarray/hashdescr.c
    M numpy/core/src/multiarray/item_selection.c
    M numpy/core/src/multiarray/iterators.c
    M numpy/core/src/multiarray/lowlevel_strided_loops.c.src
    M numpy/core/src/multiarray/mapping.c
    M numpy/core/src/multiarray/methods.c
    M numpy/core/src/multiarray/multiarray_tests.c.src
    M numpy/core/src/multiarray/multiarraymodule.c
    M numpy/core/src/multiarray/nditer_impl.h
    M numpy/core/src/multiarray/nditer_pywrap.c
    M numpy/core/src/multiarray/number.c
    M numpy/core/src/multiarray/numpymemoryview.c
    M numpy/core/src/multiarray/numpyos.c
    M numpy/core/src/multiarray/refcount.c
    M numpy/core/src/multiarray/scalarapi.c
    M numpy/core/src/multiarray/scalartypes.c.src
    M numpy/core/src/multiarray/sequence.c
    M numpy/core/src/multiarray/shape.c
    M numpy/core/src/multiarray/ucsnarrow.c
    M numpy/core/src/multiarray/usertypes.c
    A numpy/core/src/npysort/heapsort.c.src
    A numpy/core/src/npysort/mergesort.c.src
    M numpy/core/src/npysort/npysort_common.h
    A numpy/core/src/npysort/quicksort.c.src
    R numpy/core/src/npysort/sort.c.src
    A numpy/core/src/private/npy_pycompat.h
    M numpy/core/src/private/npy_sort.h
    M numpy/core/src/scalarmathmodule.c.src
    M numpy/core/src/umath/funcs.inc.src
    M numpy/core/src/umath/loops.c.src
    M numpy/core/src/umath/reduction.c
    M numpy/core/src/umath/ufunc_object.c
    M numpy/core/src/umath/ufunc_type_resolution.c
    M numpy/core/src/umath/umath_tests.c.src
    M numpy/core/tests/test_memmap.py
    M numpy/core/tests/test_multiarray.py
    A numpy/core/tests/test_multiarray_assignment.py
    M numpy/core/tests/test_ufunc.py
    M numpy/core/tests/test_umath.py
    M numpy/lib/_iotools.py
    M numpy/lib/arraysetops.py
    M numpy/lib/function_base.py
    M numpy/lib/npyio.py
    M numpy/lib/src/_compiled_base.c
    M numpy/lib/tests/test_arraysetops.py
    M numpy/lib/tests/test_io.py
    M numpy/lib/type_check.py
    M numpy/linalg/linalg.py
    M numpy/linalg/tests/test_linalg.py
    M numpy/random/mtrand/mtrand.c
    M numpy/random/mtrand/mtrand.pyx
    M numpy/testing/decorators.py
    M numpy/testing/nosetester.py
    A tools/allocation_tracking/alloc_hook.pyx
    A tools/allocation_tracking/setup.py
    A tools/allocation_tracking/sorttable.js
    A tools/allocation_tracking/track_allocations.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/numpy/numpy into patch-2

  Commit: 2d4a1cf774c21016cd1336094e2e5b683a0cb1f1
      https://github.com/numpy/numpy/commit/2d4a1cf774c21016cd1336094e2e5b683a0cb1f1
  Author: Aron Ahmadia <aron at ahmadia.net>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M numpy/distutils/fcompiler/__init__.py

  Log Message:
  -----------
  prefer gfortran over g77 and vendor compilers on OS X and Linux

  Commit: a806876ef5875720d048de24060b4a3ca9309f09
      https://github.com/numpy/numpy/commit/a806876ef5875720d048de24060b4a3ca9309f09
  Author: Travis E. Oliphant <teoliphant at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M numpy/distutils/fcompiler/__init__.py

  Log Message:
  -----------
  Merge pull request #325 from ahmadia/patch-2

prefer gfortran (gnu95) over vendor compilers, g77, g95 on OSX & Linux

  Commit: 3a09ad6b3bba2a9942a530a29512de2798bc4e21
      https://github.com/numpy/numpy/commit/3a09ad6b3bba2a9942a530a29512de2798bc4e21
  Author: Travis E. Oliphant <teoliphant at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Log Message:
  -----------
  BUG: Fix some tests in PR #192

  Commit: b3f918e4f9e6a91b46802e4a40208075dcb74f3f
      https://github.com/numpy/numpy/commit/b3f918e4f9e6a91b46802e4a40208075dcb74f3f
  Author: Travis E. Oliphant <teoliphant at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M numpy/distutils/fcompiler/__init__.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into maintenance/1.7.x

Compare: https://github.com/numpy/numpy/compare/58c302bb73bc...b3f918e4f9e6