Merge (parallel tests had already been fixed in upstream)

[z_archive/twitter.git] / setup.py

diff --git a/setup.py b/setup.py
index 39a7c118a70e90d1359ac7afabd992a41fffb1ee..973dd004c1787cfcc0ee2293b203c24b85cd0a24 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,49 +1,50 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '0.3'
+version = '1.14.3'
+
+install_requires = [
+    # -*- Extra requirements: -*-
+    ]
 
 setup(name='twitter',
       version=version,
       description="An API and command-line toolset for Twitter (twitter.com)",
-      long_description="""\
-An API and command-line toolset for Twitter (twitter.com). Includes:
-
-  * a lightweight Twitter API access class.
-  * a twitter command-line tool for setting your status and getting your
-    friends' status
-  * a twitter IRC bot for announcing status updates to an IRC channel
-
-""",
+      long_description=open("./README", "r").read(),
       # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
-          "Development Status :: 4 - Beta",
+          "Development Status :: 5 - Production/Stable",
           "Environment :: Console",
           "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",
+          "License :: OSI Approved :: MIT License",
           ],
       keywords='twitter, IRC, command-line tools, web 2.0',
       author='Mike Verdone',
       author_email='mike.verdone+twitterapi@gmail.com',
       url='http://mike.verdone.ca/twitter/',
-      license='',
+      license='MIT License',
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=True,
-      install_requires=[
-          # -*- Extra requirements: -*-
-          "simplejson>=1.7.1",
-          "dateutil>=1.1",
-      ],
+      install_requires=install_requires,
       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
       """,
       )