From 68237fc6c104b1741084902bb9c2e5b96e4943d0 Mon Sep 17 00:00:00 2001 From: Greg Turner Date: Mon, 22 May 2017 13:47:08 +0700 Subject: [PATCH] Use readme for long description --- MANIFEST.in | 1 + setup.py | 17 ++++------------- 2 files changed, 5 insertions(+), 13 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..bb37a27 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include *.rst diff --git a/setup.py b/setup.py index 3f4b18d..2b1a63d 100644 --- a/setup.py +++ b/setup.py @@ -3,18 +3,9 @@ import setuptools import sys -# Convert README.md to reStructuredText. -if {'bdist_wheel', 'sdist'}.intersection(sys.argv): - try: - import pypandoc - except ImportError: - print('WARNING: You should install `pypandoc` to convert `README.md` ' - 'to reStructuredText to use as long description.', - file=sys.stderr) - else: - print('Converting `README.md` to reStructuredText to use as long ' - 'description.') - long_description = pypandoc.convert('README.md', 'rst') +def readme(): + with open('README.rst') as f: + return f.read() setuptools.setup( name='edtf', @@ -24,7 +15,7 @@ author_email='greg@interaction.net.au', description='Python implementation of Library of Congress EDTF (Extended ' 'Date Time Format) specification', - long_description=locals().get('long_description', ''), + long_description=readme(), license='MIT', packages=setuptools.find_packages(), include_package_data=True,