delta/python-packages/numpy.git, branch auto github.com: numpy/numpy.git Auto merge of #7134 - dongjoon-hyun:fix_typos_in_code_comments, r=njsmith 2016-01-28T05:27:58+00:00 Homu homu@barosl.com 2016-01-28T05:27:58+00:00 e2805398f9a63b825f4a2aab22e9f169ff65aae9 MAINT: Fix some typos in a code string and comments 
MAINT: Fix some typos in a code string and comments
MAINT: Fix some typos in a code string and comments 2016-01-28T05:14:48+00:00 Dongjoon Hyun dongjoon@apache.org 2016-01-27T23:42:42+00:00 73a2fd11a74eedb97201fc8d54ea193e810ea9d3 






Merge pull request #7131 from charris/fix-setuptools-sdist
2016-01-27T22:35:27+00:00

Charles Harris
charlesr.harris@gmail.com

2016-01-27T22:35:27+00:00

2b34f4bf652189e0415d5bf48ef7aa3294302871

Fix setuptools sdist




Fix setuptools sdist






MAINT: warn in egg_info command if using setuptools.sdist.
2016-01-27T21:48:34+00:00

Ralf Gommers
ralf.gommers@googlemail.com

2016-01-27T20:59:57+00:00

6ae1ff280b3a6c115fe468c79c5cf4f16f998f89

Warn in numpy/distutils/command/egg_info.py if using setuptools.sdist.

See gh-7127 for details.





Warn in numpy/distutils/command/egg_info.py if using setuptools.sdist.

See gh-7127 for details.







BLD/BUG: revert usage of setuptools when building an sdist.
2016-01-27T21:48:02+00:00

Ralf Gommers
ralf.gommers@googlemail.com

2016-01-27T20:34:28+00:00

6770f985b3663338d023dd707d43a6a53f530668

This was seriously broken.  Setuptools does unwanted 'smart' things and
ignores MANIFEST.in.  Closes gh-7127.





This was seriously broken.  Setuptools does unwanted 'smart' things and
ignores MANIFEST.in.  Closes gh-7127.







TST: test installing from sdist on TravisCI.
2016-01-27T21:47:51+00:00

Ralf Gommers
ralf.gommers@googlemail.com

2016-01-27T20:33:12+00:00

2a079b2d39ea71938912528cbe9d679649bf77b9












Merge pull request #7118 from gfyoung/f2py_patch_linux
2016-01-26T15:20:40+00:00

Charles Harris
charlesr.harris@gmail.com

2016-01-26T15:20:40+00:00

cc2b0495118e4855acfeaea3253abf449f3e91dd

TST: Fixed f2py test for non-versioned python executables




TST: Fixed f2py test for non-versioned python executables






TST: Fixed f2py test for non-versioned python executables
2016-01-25T21:50:12+00:00

gfyoung
gfyoung@mit.edu

2016-01-25T21:07:12+00:00

588a1c3e42302418de80eb5f7da4ad375228396e

The 'sys.executable' can come in various names, but
the three main ones are "python", "python{major_version}",
and "python{major_version.minor_version}". The current
version of the f2py test assumes that only the latter
two are used. Since "f2py" is generally versioned,
using the executable basename "python" will make it
impossible to find. This commit fixes that issue
by using a sure-fire way of getting the Python version.





The 'sys.executable' can come in various names, but
the three main ones are "python", "python{major_version}",
and "python{major_version.minor_version}". The current
version of the f2py test assumes that only the latter
two are used. Since "f2py" is generally versioned,
using the executable basename "python" will make it
impossible to find. This commit fixes that issue
by using a sure-fire way of getting the Python version.







Merge pull request #7116 from gfyoung/f2py_patch
2016-01-25T21:32:31+00:00

Charles Harris
charlesr.harris@gmail.com

2016-01-25T21:32:31+00:00

471bab33bbfac24df42221b5c5739a190ca4018e

TST: Fixed f2py test for win32 virtualenv




TST: Fixed f2py test for win32 virtualenv






TST: Fixed f2py test for win32 virtualenv
2016-01-25T19:20:35+00:00

gfyoung
gfyoung@mit.edu

2016-01-25T18:37:23+00:00

d3d2f8e92cd08bb64cc520cf714bc70fb31909ce

Fixed test_scripts.test_f2py test so that
it can pass correctly on win32 virtualenvs,
in which the Python executable and the
f2py.py file are both in the Scripts
directory.





Fixed test_scripts.test_f2py test so that
it can pass correctly on win32 virtualenvs,
in which the Python executable and the
f2py.py file are both in the Scripts
directory.