Merge pull request #165 from roskoff/master

[rainbowstream.git] / setup.py

diff --git a/setup.py b/setup.py
index 0c15d7af59d2411b877e291d82861d096ace51e1..8bfd89117835986f2473b1c76d3f561ef82fbb59 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,28 +1,37 @@
 from setuptools import setup, find_packages
-import os, os.path, sys
+import os
+import os.path
+import sys
+
+if sys.version[0] == "2":
+    from pipes import quote
+else:
+    from shlex import quote
 
 # Bumped version
-version = '0.5.5'
+version = '1.3.3'
 
 # Require
 install_requires = [
     "python-dateutil",
-    "requests",
+    "arrow",
+    "requests==2.5.3",
     "pyfiglet",
-    "SQLAlchemy",
     "twitter",
     "Pillow",
+    "PySocks"
 ]
 
-# Python 3 doesn't hava pysqlite
-if sys.version[0] == "2":
-    install_requires += ["pysqlite"]
+# Default user (considers non virtualenv method)
+user = os.environ.get('SUDO_USER', os.environ['USER'])
 
 # Copy default config if not exists
 default = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
 if not os.path.isfile(default):
     cmd = 'cp rainbowstream/colorset/config ' + default
     os.system(cmd)
+    cmd = 'chown ' + quote(user) + ' ' + default
+    os.system(cmd)
     cmd = 'chmod 777 ' + default
     os.system(cmd)
 
@@ -41,6 +50,7 @@ setup(name='rainbowstream',
           "Programming Language :: Python :: 3.2",
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
+          "Programming Language :: Python :: 3.5",
           "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
           "Topic :: Utilities",
           "License :: OSI Approved :: MIT License",