From 570168627242bfe372682d063975d08126bd1851 Mon Sep 17 00:00:00 2001 From: Henning Peters Date: Sat, 12 Mar 2016 13:47:10 +0100 Subject: [PATCH] cleanup --- LICENSE.txt => LICENSE | 0 MANIFEST.in | 2 ++ README-MSVC.txt | 17 ----------------- README.md => README.rst | 0 setup.py | 16 ++++++++++++++++ tox.ini | 13 ------------- 6 files changed, 18 insertions(+), 30 deletions(-) rename LICENSE.txt => LICENSE (100%) delete mode 100644 README-MSVC.txt rename README.md => README.rst (100%) delete mode 100644 tox.ini diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/MANIFEST.in b/MANIFEST.in index 18e7a8b29..ff153e1ae 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,3 @@ recursive-include include *.h +include buildbot.json +include LICENSE.txt diff --git a/README-MSVC.txt b/README-MSVC.txt deleted file mode 100644 index cc45eab3f..000000000 --- a/README-MSVC.txt +++ /dev/null @@ -1,17 +0,0 @@ -Python 2.7 Windows build has been tested with the following toolchain: - - Python 2.7.10 :) - - Microsoft Visual C++ Compiler Package for Python 2.7 http://www.microsoft.com/en-us/download/details.aspx?id=44266 - - C99 compliant stdint.h for MSVC https://msinttypes.googlecode.com/svn/trunk/stdint.h - (C99 complian stdint.h header which is not supplied with Microsoft Visual C++ compiler prior to MSVC 2010) - -Build steps: - - pip install --upgrade setuptools - - pip install cython fabric fabtools - - pip install -r requirements.txt - - python pip install -e . - -If you are using traditional Microsoft SDK (v7.0 for Python 2.x or v7.1 for Python 3.x) consider run_with_env.cmd from appveyor folder (submodule) as a guideline for environment setup. -It can be also used as shell conviguration script for your build, install and run commands, i.e.: cmd /E:ON /V:ON /C run_with_env.cmd - - - \ No newline at end of file diff --git a/README.md b/README.rst similarity index 100% rename from README.md rename to README.rst diff --git a/setup.py b/setup.py index 176434151..b3ee63a17 100644 --- a/setup.py +++ b/setup.py @@ -168,6 +168,7 @@ def setup_package(): packages=PACKAGES, package_data={'': ['*.pyx', '*.pxd', '*.txt', '*.tokens']}, description=about['__summary__'], + long_description=open(os.path.join(root, 'README.rst')).read(), author=about['__author__'], author_email=about['__email__'], version=about['__version__'], @@ -177,6 +178,21 @@ def setup_package(): 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', + 'Intended Audience :: Developers', + 'Intended Audience :: Science/Research', + 'License :: OSI Approved :: MIT License', + 'Operating System :: POSIX :: Linux', + 'Operating System :: MacOS :: MacOS X', + 'Operating System :: Microsoft :: Windows', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Topic :: Scientific/Engineering'], cmdclass = { 'build_ext': build_ext_subclass}, ) diff --git a/tox.ini b/tox.ini deleted file mode 100644 index a4b67ef54..000000000 --- a/tox.ini +++ /dev/null @@ -1,13 +0,0 @@ -[tox] -envlist = - py27 - py34 -recreate = True - -[testenv] -changedir = {envtmpdir} -deps = - pytest -commands = - python -m spacy.en.download - python -m pytest {toxinidir}/spacy/ -x --models --vectors --slow