Merge (parallel tests had already been fixed in upstream)

[z_archive/twitter.git] / setup.py

diff --git a/setup.py b/setup.py
index 2e89d92e31a92b5e224157e3b3cfea6aff697438..973dd004c1787cfcc0ee2293b203c24b85cd0a24 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,20 +1,12 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '1.4'
+version = '1.14.3'
 
 install_requires = [
     # -*- Extra requirements: -*-
-    "python-dateutil>=1.1",
     ]
 
-def _py26OrGreater():
-    return sys.hexversion > 0x20600f0
-
-if not _py26OrGreater():
-    install_requires.append("simplejson>=1.7.1")
-
-
 setup(name='twitter',
       version=version,
       description="An API and command-line toolset for Twitter (twitter.com)",
@@ -26,7 +18,11 @@ setup(name='twitter',
           "Intended Audience :: End Users/Desktop",
           "Natural Language :: English",
           "Operating System :: OS Independent",
-          "Programming Language :: Python",
+          "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",
@@ -46,5 +42,9 @@ setup(name='twitter',
       [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
       """,
       )