Merge branch 'master' into develop

[etc/taskwarrior.git] / setup.py

diff --git a/setup.py b/setup.py
index e3b46a5e606a77baf9da7ff4d2f3bbb5f4c37d61..ddca69451d0c570967f51584677efdf7af920c63 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,17 @@
 from setuptools import setup, find_packages
 
 from setuptools import setup, find_packages
 

+install_requirements = ['six==1.5.2', 'pytz', 'tzlocal']
+
+version = '0.11.0'
+
+try:
+    import importlib
+except ImportError:
+    install_requirements.append('importlib')
+

 setup(
     name='tasklib',
 setup(
     name='tasklib',

-    version='0.2',
+    version=version,

     description='Python Task Warrior library',
     long_description=open('README.rst').read(),
     author='Rob Golding',
     description='Python Task Warrior library',
     long_description=open('README.rst').read(),
     author='Rob Golding',


@@ -13,11 +22,18 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     test_suite='tasklib.tests',
     packages=find_packages(),
     include_package_data=True,
     test_suite='tasklib.tests',

+    install_requires=install_requirements,

     classifiers=[
         'Development Status :: 4 - Beta',
     classifiers=[
         'Development Status :: 4 - Beta',

+        'Programming Language :: Python',
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",

         'License :: OSI Approved :: BSD License',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'License :: OSI Approved :: BSD License',
         'Topic :: Software Development :: Libraries :: Python Modules',

-        'Programming Language :: Python',

         'Intended Audience :: Developers',
     ],
 )
         'Intended Audience :: Developers',
     ],
 )