From 1fe29c69196a56421a29e5c8d70d447115a45078 Mon Sep 17 00:00:00 2001 From: Henning Peters Date: Sun, 13 Mar 2016 18:12:32 +0100 Subject: [PATCH] cleanup --- MANIFEST.in | 1 + README.rst | 2 +- requirements.txt | 4 ++-- setup.py | 20 ++++++++++++++++---- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index b29c76e76..e15d9de6d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ recursive-include include *.h include buildbot.json include LICENSE +include README.rst diff --git a/README.rst b/README.rst index 9bb6a336b..557e8a6aa 100644 --- a/README.rst +++ b/README.rst @@ -28,7 +28,7 @@ Features * No pre-processing required. spaCy takes raw text as input, warts and newlines and all. Top Peformance -------------- +-------------- * Fastest in the world: <50ms per document. No faster system has ever been announced. diff --git a/requirements.txt b/requirements.txt index 09dd74496..aa9b68311 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ cython -cymem>=1.30,<1.32 pathlib +numpy +cymem>=1.30,<1.32 preshed>=0.46.1,<0.47.0 thinc>=5.0.0,<5.1.0 murmurhash>=0.26,<0.27 -numpy plac six ujson diff --git a/setup.py b/setup.py index cb2256383..7244a0b98 100644 --- a/setup.py +++ b/setup.py @@ -144,10 +144,13 @@ def setup_package(): return clean(root) with chdir(root): - about = {} with open(os.path.join(root, "spacy", "about.py")) as f: + about = {} exec(f.read(), about) + with open(os.path.join(root, 'README.rst')) as f: + readme = f.read() + include_dirs = [ get_python_inc(plat_specific=True), os.path.join(root, 'include')] @@ -168,15 +171,24 @@ def setup_package(): packages=PACKAGES, package_data={'': ['*.pyx', '*.pxd', '*.txt', '*.tokens']}, description=about['__summary__'], + long_description=readme, author=about['__author__'], author_email=about['__email__'], version=about['__version__'], url=about['__uri__'], license=about['__license__'], ext_modules=ext_modules, - install_requires=['numpy', 'murmurhash>=0.26,<0.27', 'cymem>=1.30,<1.32.0', 'preshed>=0.46.1,<0.47', - 'thinc>=5.0.0,<5.1.0', 'plac', 'six', - 'ujson', 'cloudpickle', 'sputnik>=0.9.2,<0.10.0'], + install_requires=[ + 'numpy', + 'murmurhash>=0.26,<0.27', + 'cymem>=1.30,<1.32.0', + 'preshed>=0.46.1,<0.47', + 'thinc>=5.0.0,<5.1.0', + 'plac', + 'six', + 'ujson', + 'cloudpickle', + 'sputnik>=0.9.2,<0.10.0'], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Console',