Merge pull request #586 from efiop/master

pypi fixes

dvc/__init__.py

@@ -3,5 +3,5 @@ DVC
 ----
 Make your data science projects reproducible and shareable.
 """
-VERSION = '0.9.1'
+VERSION = '0.9.2'
 __version__ = VERSION

scripts/pypi_upload.sh

@@ -8,5 +8,6 @@ if [ ! -d "dvc" ]; then
 fi
 
 rm -rf dist/
+pip install m2r twine
 python setup.py bdist_wheel --universal
 twine upload dist/*

setup.py

@@ -1,8 +1,18 @@
+import os
 import platform
 from setuptools import setup, find_packages
 from distutils.errors import DistutilsPlatformError
 from dvc import VERSION
 
+readme_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'README.md')
+try:
+    from m2r import parse_from_file
+    readme = parse_from_file(readme_file)
+except ImportError:
+    # m2r may not be installed in user environment
+    with open(readme_file) as f:
+        readme = f.read()
+
 install_requires = [
     "boto>=2.46.1",
     "google-compute-engine>=2.4.1", #required by boto
@@ -27,8 +37,7 @@ setup(
     name='dvc',
     version=VERSION,
     description='Git for data scientists - manage your code and data together',
-    long_description=open('README.md', 'r').read(),
-    long_description_content_type='text/markdown',
+    long_description=readme,
     author='Dmitry Petrov',
     author_email='[email protected]',
     url='https://github.com/dataversioncontrol/dvc.git',