Updated setup.py

Author: pawelad

ivona_api/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.1.1'

setup.py

@@ -1,46 +1,48 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function
-import sys
-from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
-
+from __future__ import unicode_literals
 
-class Tox(TestCommand):
-    user_options = [('tox-args=', 'a', "Arguments to pass to tox")]
+import io
+import os
+import re
 
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.tox_args = None
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
+from setuptools import setup, find_packages
 
-    def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
-        import tox
-        import shlex
-        args = self.tox_args
-        if args:
-            args = shlex.split(self.tox_args)
-        errno = tox.cmdline(args=args)
-        sys.exit(errno)
 
 # Convert description from markdown to reStructuredText
 try:
     import pypandoc
-    description = pypandoc.convert('README.md', 'rst')
-except (IOError, ImportError):
+    description = pypandoc.convert('README.md', 'rst', 'markdown')
+except (OSError, ImportError):
     description = ''
 
 
+# Get package version number
+# Source: https://packaging.python.org/single_source_version/
+def read(*names, **kwargs):
+    with io.open(
+        os.path.join(os.path.dirname(__file__), *names),
+        encoding=kwargs.get('encoding', 'utf8')
+    ) as fp:
+        return fp.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.")
+
 setup(
     name='ivona_api',
     url='https://github.com/Pythonity/python-ivona-api',
-    download_url='https://github.com/Pythonity/python-ivona-api/releases/latest',
+    download_url='https://github.com/Pythonity/python-ivona-api/releases/'
+                 'latest',
     bugtrack_url='https://github.com/Pythonity/python-ivona-api/issues',
-    version='0.1.1',
+    version=find_version('ivona_api', '__init__.py'),
     license='MIT License',
     author='Pythonity',
     author_email='pythonity@pythonity.com',
@@ -51,8 +53,6 @@ def run_tests(self):
     long_description=description,
     packages=find_packages(),
     include_package_data=True,
-    tests_require=['tox'],
-    cmdclass={'test': Tox},
     install_requires=[
         'requests[security]>=2.12.1',
         'requests-aws4auth>=0.9',
@@ -68,8 +68,11 @@ def run_tests(self):
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )