install_required by setup.py

diff --git a/README.md b/README.md
index 44aafce904ad29dc51f1a15b3c5fd1c61dd15a81..082926a8110ca261f1b81d26a588391301eafb75 100644 (file)
--- a/README.md
+++ b/README.md
@@ -18,14 +18,12 @@ git clone https://github.com/DTVD/rainbowstream.git
 cd rainbowstream
 virtualenv venv # Assume that you have virtualenv installed by "pip install virtualenv"
 source venv/bin/activate
-pip install -r requirements.txt
 pip install -e .
 ```
 **The quick way:**
 * Install everything over the air
 
 ```bash
-sudo pip install -r https://raw.githubusercontent.com/DTVD/rainbowstream/master/requirements.txt
 sudo pip install git+https://github.com/DTVD/rainbowstream.git
 ```
 **Note the I only support Python version 2.7+**

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 8efd093ea155eed3aa2c75aaf4860ed37dcb8698..a0cdc22e92922836adec9d3ab4fd30c1754999c6 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -1,3 +1,3 @@
-# This is PTT App info
+# This is RainbowStream App info
 CONSUMER_KEY = 'Xk1DGhR1FJa4xjg7GbdogzLJw'
 CONSUMER_SECRET = 'SpHtDmbSGCSm55AAlIeb2PsD3kGEzxyo1325rJgrND5abeOh2T'

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index c08920ba6f4cf8b0cd6be97e63bc7746894fe214..4d6f5c86ff832658064e04cb0446b4548bb40f39 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -10,7 +10,6 @@ from twitter.stream import TwitterStream, Timeout, HeartbeatTimeout, Hangup
 from twitter.oauth import OAuth, read_token_file
 from twitter.oauth_dance import oauth_dance
 from twitter.util import printNicely
-from twitter.ansi import *
 from dateutil import parser
 
 from colors import *
@@ -66,7 +65,7 @@ def parse_arguments():
     return parser.parse_args()
 
 
-def main():
+def stream():
     args = parse_arguments()
 
     # The Logo
@@ -113,6 +112,3 @@ def main():
             printNicely(line2)
             printNicely(line3)
             printNicely(line4)
-
-if __name__ == '__main__':
-    main()

diff --git a/requirements.txt b/requirements.txt
index 3cdd3ae4f50564ea6f32d8f7cfe66d73851c1ae5..4ec9a9338e7ec8f6ecce5dfb14bbf3869b3b4f6d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,6 @@
 colorama==0.3.1
 pyfiglet==0.6.1
-pyglet==1.1.4
 python-dateutil==2.2
 six==1.6.1
 termcolor==1.1.0
 twitter==1.14.3
-wsgiref==0.1.2

diff --git a/setup.py b/setup.py
index 2ec00ec8a3da8ab5acf12dd56229458f2cab9e0e..f0f52f6a829da0b8acaebfb2d970e1d3b960d4f6 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,14 +3,17 @@ from setuptools import setup, find_packages
 version = '0.0.1'
 
 install_requires = [
-    # -*- Extra requirements: -*-
+    "colorama",
+    "pyfiglet",
+    "python-dateutil",
+    "termcolor",
+    "twitter"
     ]
 
 setup(name='rainbowstream',
       version=version,
       description="A rainbow streaming console for Twitter (twitter.com)",
       long_description=open("./README.md", "r").read(),
-      # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
           "Development Status :: 5 - Production/Stable",
           "Environment :: Console",
@@ -38,6 +41,6 @@ setup(name='rainbowstream',
       entry_points="""
       # -*- Entry points: -*-
       [console_scripts]
-      rainbowstream=rainbowstream.rainbow:main
+      rainbowstream=rainbowstream.rainbow:stream
       """,
       )