From 286728f01c5bb00f27cd081a5147bad8a79d488a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thiago=20D=27=C3=81vila?= Date: Thu, 17 Jan 2019 20:05:16 -0200 Subject: [PATCH] Config and requirements improvements --- enelvo/__init__.py | 6 +++--- requirements.txt | 12 ++++++------ setup.py | 49 ++++++++++++++++++++++++++++++++++------------ 3 files changed, 45 insertions(+), 22 deletions(-) diff --git a/enelvo/__init__.py b/enelvo/__init__.py index 67156d8..bf7e2a4 100644 --- a/enelvo/__init__.py +++ b/enelvo/__init__.py @@ -3,7 +3,7 @@ Enelvo ~~~~~~~~~~~~~~~~~~~ A flexible normalizer for user-generated content. -:copyright: (c) 2017 by Thales Bertaglia +:copyright: (c) 2017-2019 by Thales Bertaglia :licence: MIT, see LICENSE for more details """ import logging @@ -13,13 +13,13 @@ __summary__ = 'A flexible normaliser for user-generated content.' __uri__ = 'https://www.github.com/tfcbertaglia/enelvo' -__version__ = '0.0.7' +__version__ = '0.0.9' __author__ = 'Thales Bertaglia' __email__ = 'contact@thalesbertaglia.com' __license__ = 'MIT' -__copyright__ = 'Copyright 2017 Thales Bertaglia' +__copyright__ = 'Copyright 2017-2019 Thales Bertaglia' # the user should dictate what happens when a logging event occurs logging.getLogger(__name__).addHandler(logging.NullHandler()) diff --git a/requirements.txt b/requirements.txt index 01fcc98..62932c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -gensim>=2.2.0 -emoji>=0.4.5 -tabulate>=0.7.7 -editdistance>=0.3.1 -numpy>=1.13.3 -cython +gensim==3.6.0 +emoji==0.5.1 +tabulate==0.8.2 +editdistance==0.5.2 +numpy==1.16.0 +cython==0.29.2 diff --git a/setup.py b/setup.py index 22cd7c5..ff019e8 100644 --- a/setup.py +++ b/setup.py @@ -1,21 +1,43 @@ +import codecs +import os.path +import re +import sys from Cython.Build import cythonize from Cython.Distutils import build_ext from setuptools import setup, Extension +here = os.path.abspath(os.path.dirname(__file__)) + + +def read(*parts): + return codecs.open(os.path.join(here, *parts), 'r').read() + + +def find_version(*file_paths): + version_file = read(*file_paths) + version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", + version_file, re.M) + if version_match: + return version_match.group(1) + raise RuntimeError("Unable to find version string.") + REQUIRED_PYTHON = (3, 5) ext_modules = [ - Extension("enelvo.metrics.cythonlcs", ["enelvo/metrics/cythonlcs.pyx"], include_dirs=['.'])] + Extension("enelvo.metrics.cythonlcs", + ["enelvo/metrics/cythonlcs.pyx"], include_dirs=['.'])] setup( name='Enelvo', - version='0.0.7', + version=find_version("enelvo", "__init__.py"), packages=['enelvo', 'enelvo.preprocessing', 'enelvo.candidate_generation', - 'enelvo.candidate_scoring', 'enelvo.metrics', 'enelvo.utils', 'enelvo.preprocessing.tokenizer'], - package_data = {'enelvo' : ['../requirements.txt', 'resources/lexicons/*', - 'resources/corr-lexicons/*', 'resources/embeddings/norm_lexicon.pickle', - '../setup_cython.py', '../build/*', - 'preprocessing/tokenizer/lexicons/*'] }, + 'enelvo.candidate_scoring', 'enelvo.metrics', + 'enelvo.utils', 'enelvo.preprocessing.tokenizer'], + package_data={'enelvo': ['../requirements.txt', 'resources/lexicons/*', + 'resources/corr-lexicons/*', + 'resources/embeddings/norm_lexicon.pickle', + '../setup_cython.py', '../build/*', + 'preprocessing/tokenizer/lexicons/*']}, license='MIT', long_description=open('README.md', encoding='utf-8').read(), author='Thales Bertaglia', @@ -24,12 +46,13 @@ python_requires='>={}.{}'.format(*REQUIRED_PYTHON), include_package_data=True, install_requires=[ - 'gensim>=2.2.0', - 'emoji>=0.4.5', - 'tabulate>=0.7.7', - 'editdistance>=0.3.1', - 'numpy>=1.13.3', 'cython'], + 'gensim>=3.6.0', + 'emoji>=0.5.1', + 'tabulate>=0.8.2', + 'editdistance>=0.5.2', + 'numpy>=1.16.0', + 'cython>=0.29.2'], cmdclass={'build_ext': build_ext}, ext_modules=ext_modules, - options={'build_ext':{'inplace':True, 'force':True}}, + options={'build_ext': {'inplace': True, 'force': True}}, )