Merge pull request #272 from koobs/patch-1

[z_archive/twitter.git] / setup.py

diff --git a/setup.py b/setup.py
index 4fda4fed6166f2180c7fa123e9536ce8aa7c1092..0a9014a535f9b721787236566ccb5775ee4b8e0b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,17 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '1.6'
+version = '1.15.0'
 
 install_requires = [
     # -*- Extra requirements: -*-
     ]
+if sys.version_info < (2,7):
+    install_requires.append('argparse')
+
+tests_require = [
+    'nose',
+    ]
 
 setup(name='twitter',
       version=version,
@@ -18,9 +24,11 @@ setup(name='twitter',
           "Intended Audience :: End Users/Desktop",
           "Natural Language :: English",
           "Operating System :: OS Independent",
-          "Programming Language :: Python :: 3",
           "Programming Language :: Python :: 2.6",
           "Programming Language :: Python :: 2.7",
+          "Programming Language :: Python :: 3.2",
+          "Programming Language :: Python :: 3.3",
+          "Programming Language :: Python :: 3.4",
           "Topic :: Communications :: Chat :: Internet Relay Chat",
           "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
           "Topic :: Utilities",
@@ -35,11 +43,16 @@ setup(name='twitter',
       include_package_data=True,
       zip_safe=True,
       install_requires=install_requires,
+      tests_require=tests_require,
+      test_suite = 'nose.collector',
       entry_points="""
       # -*- Entry points: -*-
       [console_scripts]
       twitter=twitter.cmdline:main
       twitterbot=twitter.ircbot:main
       twitter-log=twitter.logger:main
+      twitter-archiver=twitter.archiver:main
+      twitter-follow=twitter.follow:main
+      twitter-stream-example=twitter.stream_example:main
       """,
       )