From b670db30ecbaf9428ccb11dfa691be24c1add147 Mon Sep 17 00:00:00 2001 From: Mariusz Korzekwa Date: Fri, 28 Apr 2017 13:51:43 +0200 Subject: [PATCH] Improve setup.py * Now setup.py don't import googletrans.__init__.py wchich import requests, and this occure ImportError during installation of library. * Changes with getting version in setup.py without importing googletrans.__init__.py Now you can install py-googletrans on clean virtualenv, without earlier install dependencies. --- googletrans/__init__.py | 3 +-- setup.py | 31 +++++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/googletrans/__init__.py b/googletrans/__init__.py index c5dba57..89a43c2 100644 --- a/googletrans/__init__.py +++ b/googletrans/__init__.py @@ -1,7 +1,6 @@ """Free Google Translate API for Python. Translates totally free of charge.""" __all__ = 'Translator', -__version_info__ = 2, 1, 2 -__version__ = '.'.join(str(v) for v in __version_info__) +__version__ = '2.1.2' from googletrans.client import Translator diff --git a/setup.py b/setup.py index 3706ada..d9cddec 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,13 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import googletrans import os.path +import re + from setuptools import setup, find_packages -def readme(): - path = os.path.join(os.path.dirname(__file__), 'README.rst') +def get_file(*paths): + path = os.path.join(*paths) try: with open(path, 'rb') as f: return f.read().decode('utf8') @@ -14,12 +15,30 @@ def readme(): pass +def get_version(): + init_py = get_file(os.path.dirname(__file__), 'googletrans', '__init__.py') + pattern = r"{0}\W*=\W*'([^']+)'".format('__version__') + version, = re.findall(pattern, init_py) + return version + + +def get_description(): + init_py = get_file(os.path.dirname(__file__), 'googletrans', '__init__.py') + pattern = r'"""(.*?)"""' + description, = re.findall(pattern, init_py, re.DOTALL) + return description + + +def get_readme(): + return get_file(os.path.dirname(__file__), 'README.rst') + + def install(): setup( name='googletrans', - version=googletrans.__version__, - description=googletrans.__doc__, - long_description=readme(), + version=get_version(), + description=get_description(), + long_description=get_readme(), license='MIT', author='SuHun Han', author_email='ssut' '@' 'ssut.me',