bandaid unicode/str.encode-related crash bug

[z_archive/twitter.git] / setup.py

diff --git a/setup.py b/setup.py
index c8e65ffbd3a896a3df2c3b2d22a005f522cc6c33..b428d0fca9b16a2fddc1455b004547bcbe87fe27 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,17 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '1.4.1'
+version = '1.17.1'
 
 install_requires = [
     # -*- Extra requirements: -*-
-    "python-dateutil>=1.1",
     ]
+if sys.version_info < (2,7):
+    install_requires.append('argparse')
 
-def _py26OrGreater():
-    return sys.hexversion > 0x20600f0
-
-if not _py26OrGreater():
-    install_requires.append("simplejson>=1.7.1")
-
+tests_require = [
+    'nose',
+    ]
 
 setup(name='twitter',
       version=version,
@@ -26,7 +24,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",
@@ -41,10 +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
       """,
       )