Merge branch 'master' into develop

Author: dan-blanchard

README.rst

@@ -17,6 +17,10 @@ DRMAA Python
    :target: https://crate.io/packages/drmaa
    :alt: Latest version on PyPI
 
+.. image:: https://d2weczhvl823v0.cloudfront.net/drmaa-python/drmaa-python/trend.png
+   :alt: Bitdeli badge
+   :target: https://bitdeli.com/free
+
 `Distributed Resource Management Application API <http://en.wikipedia.org/wiki/DRMAA>`__
 (DRMAA) bindings for Python. For more information
 `read the docs <http://drmaa-python.readthedocs.org>`__.

setup.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # -----------------------------------------------------------
 #  Copyright (C) 2009 StatPro Italia s.r.l.
 #
@@ -29,13 +27,18 @@
 exec(compile(open('drmaa/version.py').read(), 'drmaa/version.py', 'exec'))
 # (we use the above instead of execfile for Python 3.x compatibility)
 
+def readme():
+    with open('README.rst') as f:
+        return f.read()
+
 setup(name="drmaa",
       version=__version__,
       packages=packages,
       package_data=package_data,
       author="Dan Blanchard",
       author_email="[email protected]",
       description="a python DRMAA library",
+      long_description=readme(),
       license="BSD",
       keywords="python grid hpc drmaa",
       url="https://github.com/drmaa-python/drmaa-python",