diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-09-25 11:40:55 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-09-25 11:40:55 -0600 |
| commit | 1bf73fa0119fc4ed9ab771d01e1cee5e9fd36c76 (patch) | |
| tree | dcc5cf40fbf5c42b8dbc54c1f89268d0561471f0 /numpy | |
| parent | 1765438b5f68eeb5c9b920e8df2760dc8e908cae (diff) | |
| parent | 935c634e5665647187af8545cb94394f9ac9da82 (diff) | |
| download | numpy-1bf73fa0119fc4ed9ab771d01e1cee5e9fd36c76.tar.gz | |
Merge pull request #6347 from charris/fix-sdist-missing-files
Fix a couple of distribution problems
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/setup.py | 3 | ||||
| -rw-r--r-- | numpy/lib/tests/test__version.py | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 6d9926d89..361bf9082 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -736,6 +736,7 @@ def configuration(parent_package='',top_path=None): join('src', 'multiarray', 'array_assign.h'), join('src', 'multiarray', 'buffer.h'), join('src', 'multiarray', 'calculation.h'), + join('src', 'multiarray', 'cblasfuncs.h'), join('src', 'multiarray', 'common.h'), join('src', 'multiarray', 'convert_datatype.h'), join('src', 'multiarray', 'convert.h'), @@ -839,6 +840,8 @@ def configuration(parent_package='',top_path=None): blas_info = get_info('blas_opt', 0) if blas_info and ('HAVE_CBLAS', None) in blas_info.get('define_macros', []): extra_info = blas_info + # These files are also in MANIFEST.in so that they are always in + # the source distribution independently of HAVE_CBLAS. multiarray_src.extend([join('src', 'multiarray', 'cblasfuncs.c'), join('src', 'multiarray', 'python_xerbla.c'), ]) diff --git a/numpy/lib/tests/test__version.py b/numpy/lib/tests/test__version.py index bbafe68eb..993c9d507 100644 --- a/numpy/lib/tests/test__version.py +++ b/numpy/lib/tests/test__version.py @@ -48,6 +48,19 @@ def test_dev_a_b_rc_mixed(): assert_(NumpyVersion('1.9.0a2.dev-6acvda54') < '1.9.0a2') +def test_dev0_version(): + assert_(NumpyVersion('1.9.0.dev0+Unknown') < '1.9.0') + for ver in ['1.9.0', '1.9.0a1', '1.9.0b2', '1.9.0b2.dev0+ffffffff']: + assert_(NumpyVersion('1.9.0.dev0+f16acvda') < ver) + + assert_(NumpyVersion('1.9.0.dev0+f16acvda') == '1.9.0.dev0+11111111') + + +def test_dev0_a_b_rc_mixed(): + assert_(NumpyVersion('1.9.0a2.dev0+f16acvda') == '1.9.0a2.dev0+11111111') + assert_(NumpyVersion('1.9.0a2.dev0+6acvda54') < '1.9.0a2') + + def test_raises(): for ver in ['1.9', '1,9.0', '1.7.x']: assert_raises(ValueError, NumpyVersion, ver) |