uploaded to pypi: updated setup and readme

javisantana · javisantana · commit ae8cdbeb9383 · 2011-12-22T09:13:33.000+01:00
diff --git a/README.md b/README.md
@@ -6,15 +6,26 @@ The cartodb-python project is a Python client for the [CartoDB SQL API](http://d
 
 You can install cartodb-python by cloning this repository or by using [Pip](http://pypi.python.org/pypi/pip), a Python package installer similar to easy_install.
 
+```bash
+pip install cartodb
+```
+
+or if you want to use the development version
 
 ```bash
 pip install -e git+git://github.com/javisantana/cartodb-python.git#egg=cartodb
 ```
 
-Note that cartodb-python depends on the python-oauth2 module:
+Note that cartodb-python depends on the ouath2 module
+
+```bash
+pip install oauth2
+```
+
+and if you're running python < 2.6 you need to install simplejson
 
 ```bash
-sudo apt-get install python-oauth2
+pip install simplejson
 ```
 
 
@@ -36,4 +47,4 @@ try:
     print cl.sql('select * from mytable')
 except CartoDBException as e:
     print ("some error ocurred", e)
-```
+```
diff --git a/setup.py b/setup.py
@@ -1,12 +1,18 @@
 
 from distutils.core import setup
+import sys
+
+REQUIRES = ['oauth2']
+if sys.version_info < (2 , 6):
+    REQUIRES.append('simplejson')
 
 setup(name='cartodb', 
       author = 'Javi Santana', 
       author_email = 'jsantana@vizzuality.com',
       description = 'client to access cartodb api',
       url='https://github.com/javisantana/cartodb',
-      version='0.2',
+      version='0.3',
+      install_requires=REQUIRES,
       packages=['cartodb'],
-      requires = ['oauth2', 'simplejson']
+      requires = REQUIRES
 )
