From ffde199a1b7b7a0a3670f52f49e6820ddcc0ee4b Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Wed, 29 Nov 2017 11:53:21 -0700 Subject: BLD: Include the license file in NumPy wheels. The `LICENSE.txt` file needs to be in the numpy wheels in order to meet the terms of the linked libraries. Add it to the configuration data files so that it shows up in the numpy package. --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index ed8b457bf..d0749985e 100755 --- a/setup.py +++ b/setup.py @@ -81,7 +81,7 @@ def git_version(): env['LANGUAGE'] = 'C' env['LANG'] = 'C' env['LC_ALL'] = 'C' - out = subprocess.Popen(cmd, stdout = subprocess.PIPE, env=env).communicate()[0] + out = subprocess.Popen(cmd, stdout=subprocess.PIPE, env=env).communicate()[0] return out try: @@ -147,8 +147,8 @@ if not release: a = open(filename, 'w') try: a.write(cnt % {'version': VERSION, - 'full_version' : FULLVERSION, - 'git_revision' : GIT_REVISION, + 'full_version': FULLVERSION, + 'git_revision': GIT_REVISION, 'isrelease': str(ISRELEASED)}) finally: a.close() @@ -164,6 +164,7 @@ def configuration(parent_package='',top_path=None): quiet=True) config.add_subpackage('numpy') + config.add_data_files(('numpy', 'LICENSE.txt')) config.get_version('numpy/version.py') # sets config.version -- cgit v1.2.1 From 2585cf76013d6cfa61e99e859ca3c05de379a97e Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Wed, 29 Nov 2017 12:27:12 -0700 Subject: BLD: Update MANIFEST.in Exclude more development artifacts and include the `tox.ini` file. --- MANIFEST.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 4e5206b94..3d3e47f45 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,6 +11,7 @@ recursive-include numpy/random/mtrand *.pyx *.pxd # Add build support that should go in sdist, but not go in bdist/be installed recursive-include numpy/_build_utils * recursive-include numpy/linalg/lapack_lite *.c *.h +include tox.ini # Add sdist files whose use depends on local configuration. include numpy/core/src/multiarray/cblasfuncs.c include numpy/core/src/multiarray/python_xerbla.c @@ -27,4 +28,4 @@ recursive-include tools/swig * recursive-include doc/scipy-sphinx-theme * recursive-include doc/f2py * -global-exclude *.pyc *.pyo *.pyd +global-exclude *.pyc *.pyo *.pyd *.swp *.bak *~ -- cgit v1.2.1