8000 Merge pull request #6363 from charris/fix-sdist-missing-files · numpy/numpy@00ca7ea · GitHub
[go: up one dir, main page]

Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 00ca7ea

Browse files
committed
Merge pull request #6363 from charris/fix-sdist-missing-files
Fix sdist missing files
2 parents 128a0e9 + d8bd7fb commit 00ca7ea

File tree

4 files changed

+20
-1
lines changed

4 files changed

+20
-1
lines changed

MANIFEST.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ include numpy/random/mtrand/generate_mtrand_c.py
1212
recursive-include numpy/random/mtrand *.pyx *.pxd
1313
# Add build support that should go in sdist, but not go in bdist/be installed
1414
recursive-include numpy/_build_utils *
15+
# Add sdist files whose use depends on local configuration.
16+
include numpy/core/src/multiarray/cblasfuncs.c
17+
include numpy/core/src/multiarray/python_xerbla.c
1518
# Adding scons build related files not found by distutils
1619
recursive-include numpy/core/code_generators *.py *.txt
1720
recursive-include numpy/core *.in *.h

numpy/core/setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,7 @@ def generate_multiarray_templated_sources(ext, build_dir):
736736
join('src', 'multiarray', 'array_assign.h'),
737737
join('src', 'multiarray', 'buffer.h'),
738738
join('src', 'multiarray', 'calculation.h'),
739+
join('src', 'multiarray', 'cblasfuncs.h'),
739740
join('src', 'multiarray', 'common.h'),
740741
join('src', 'multiarray', 'convert_datatype.h'),
741742
join('src', 'multiarray', 'convert.h'),
@@ -836,6 +837,8 @@ def generate_multiarray_templated_sources(ext, build_dir):
836837
blas_info = get_info('blas_opt', 0)
837838
if blas_info and ('HAVE_CBLAS', None) in blas_info.get('define_macros', []):
838839
extra_info = blas_info
840+
# These files are also in MANIFEST.in so that they are always in
841+
# the source distribution independently of HAVE_CBLAS.
839842
multiarray_src.extend([join('src', 'multiarray', 'cblasfuncs.c'),
840843
join('src', 'multiarray', 'python_xerbla.c'),
841844
])

numpy/lib/tests/test__version.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,19 @@ def test_dev_a_b_rc_mixed():
4848
assert_(NumpyVersion('1.9.0a2.dev-6acvda54') < '1.9.0a2')
4949

5050

51+
def test_dev0_version():
52+
assert_(NumpyVersion('1.9.0.dev0+Unknown') < '1.9.0')
53+
for ver in ['1.9.0', '1.9.0a1', '1.9.0b2', '1.9.0b2.dev0+ffffffff']:
54+
assert_(NumpyVersion('1.9.0.dev0+f16acvda') < ver)
55+
56+
assert_(NumpyVersion('1.9.0.dev0+f16acvda') == '1.9.0.dev0+11111111')
57+
58+
59+
def test_dev0_a_b_rc_mixed():
60+
assert_(NumpyVersion('1.9.0a2.dev0+f16acvda') == '1.9.0a2.dev0+11111111')
61+
assert_(NumpyVersion('1.9.0a2.dev0+6acvda54') < '1.9.0a2')
62+
63+
5164
def test_raises():
5265
for ver in ['1.9', '1,9.0', '1.7.x']:
5366
assert_raises(ValueError, NumpyVersion, ver)

pavement.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
GIT_REVISION = "Unknown"
9090

9191
if not setup_py.ISRELEASED:
92-
FULLVERSION += '.dev-' + GIT_REVISION[:7]
92+
FULLVERSION += '.dev0+' + GIT_REVISION[:7]
9393
finally:
9494
sys.path.pop(0)
9595

0 commit comments

Comments
 (0)
0