From 9aeaef4af7aa723cd941e12d8ff1a73245edec9d Mon Sep 17 00:00:00 2001 From: Marcus Stoiber Date: Wed, 26 Feb 2020 15:54:57 -0800 Subject: [PATCH 1/2] Add MANIFEST for conda release with LICENSE. --- MANIFEST.in | 2 ++ setup.py | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..c28ab72 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +include README.md +include LICENSE.md diff --git a/setup.py b/setup.py index 0cef8df..fc9ffcf 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,7 @@ -import imp import os import re -import subprocess import sys -import time -from glob import glob from setuptools import setup, find_packages from setuptools.extension import Extension @@ -13,7 +9,8 @@ __pkg_name__ = 'megalodon' # Get the version number from _version.py, and exe_path -verstrline = open(os.path.join('megalodon', '_version.py'), 'r').readlines()[-1] +verstrline = open( + os.path.join('megalodon', '_version.py'), 'r').readlines()[-1] vsre = r"^MEGALODON_VERSION = ['\"]([^'\"]*)['\"]" mo = re.search(vsre, verstrline) if mo: @@ -90,7 +87,7 @@ packages=find_packages(exclude=[ "*.test", "*.test.*", "test.*", "test", "bin"]), - package_data={__pkg_name__: ['model_data/*/*',]}, + package_data={__pkg_name__: ['model_data/*/*', ]}, exclude_package_data={'': ['*.hdf', '*.c', '*.h']}, ext_modules=extensions, install_requires=install_requires, From 37ed6a9cf8e1b4586cbab90e9be063c10d2b15e8 Mon Sep 17 00:00:00 2001 From: Marcus Stoiber Date: Fri, 28 Feb 2020 10:01:07 -0800 Subject: [PATCH 2/2] Correct filenames in MANIFEST.in --- MANIFEST.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index c28ab72..d00f60c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ -include README.md -include LICENSE.md +include README.rst +include LICENCE.txt