From 1e4044fdf795c996f63890b8736ebe98c5b7e2a4 Mon Sep 17 00:00:00 2001 From: James Lu Date: Thu, 4 Aug 2016 00:27:15 -0700 Subject: [PATCH 1/2] setup.py: convert Markdown to RST using pypandoc --- setup.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 03ae8cf..2a7060f 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,6 @@ except ImportError: raise ImportError("Please install Setuptools and try again.") from codecs import open import subprocess -from os import path # Get version from Git tags. with open('VERSION', encoding='utf-8') as f: @@ -29,11 +28,13 @@ with open('__init__.py', 'w') as f: f.write('__version__ = %r\n' % version) f.write('real_version = %r\n' % real_version) -curdir = path.abspath(path.dirname(__file__)) - -# FIXME: Convert markdown to RST -with open(path.join(curdir, 'README.md'), encoding='utf-8') as f: - long_description = f.read() +# Convert Markdown to RST for PyPI +try: + import pypandoc + long_description = pypandoc.convert('README.md', 'rst') +except ImportError: + print('WARNING: PyPandoc not available; skipping writing long description.') + long_description = None setup( name='pylinkirc', From 347ddc112d6fe17c98c303d24f41675ce3746d4b Mon Sep 17 00:00:00 2001 From: James Lu Date: Thu, 4 Aug 2016 00:27:50 -0700 Subject: [PATCH 2/2] setup: refresh classifiers --- setup.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 2a7060f..2dbfb3c 100644 --- a/setup.py +++ b/setup.py @@ -54,20 +54,26 @@ setup( # See https://pypi.python.org/pypi?%3Aaction=list_classifiers classifiers=[ - 'Development Status :: 3 - Alpha', + 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'Intended Audience :: System Administrators', 'Topic :: Communications :: Chat :: Internet Relay Chat', 'Topic :: Software Development :: Libraries :: Python Modules', 'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)', + 'Environment :: Console', - 'Programming Language :: Python :: 3', + 'Operating System :: OS Independent', + 'Operating System :: POSIX', + + 'Natural Language :: English', + + 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', ], - keywords='IRC services chat', + keywords='IRC services relay', install_requires=['pyyaml', 'ircmatch'], # Folders (packages of code)