Merge 5c24d99 into 4a86090

setup.py

@@ -10,10 +10,6 @@
 
 VERSION_PATH='commcare_export/VERSION'
 
-# Build README.txt from README.md if not present, and if we are actually building for distribution to pypi
-if not os.path.exists('README.txt') and 'sdist' in sys.argv:
-    subprocess.call(['pandoc', '--to=rst', '--output=README.txt', 'README.md', '--columns=160'])
-
 # Overwrite VERSION if we are actually building for a distribution to pypi
 # This code path requires dependencies, etc, to be available
 if 'sdist' in sys.argv:
@@ -32,7 +28,7 @@
         print('Version %s is not an appropriate version for publicizing!' % version)
         sys.exit(1)
 
-readme = 'README.txt' if os.path.exists('README.txt') else 'README.md'
+readme = 'README.md'
 
 class PyTest(TestCommand):
     def finalize_options(self):
@@ -54,6 +50,7 @@ def run_tests(self):
     version = version,
     description = 'A command-line tool (and Python library) to extract data from CommCareHQ into a SQL database or Excel workbook',
     long_description = io.open(readme, encoding='utf-8').read(),
+    long_description_content_type = 'text/markdown',
     author = 'Dimagi',
     author_email = 'information@dimagi.com',
     url = "https://github.com/dimagi/commcare-export",