From cda3b94904a017d5af367e281d7623620f073b27 Mon Sep 17 00:00:00 2001 From: Cimbali Date: Fri, 31 Mar 2017 01:03:29 +0200 Subject: [PATCH] Let people use setupy.py without (py)pandoc, but emit warning --- cxfreeze_setup.py | 13 +++++++++++-- setup.py | 12 ++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/cxfreeze_setup.py b/cxfreeze_setup.py index 9f3c05bb..68e9b9ae 100755 --- a/cxfreeze_setup.py +++ b/cxfreeze_setup.py @@ -21,9 +21,18 @@ from cx_Freeze import setup, Executable import os, site, sys, importlib -import pypandoc import glob +try: + from pypandoc import convert_file +except ImportError: + print("WARNING no pypandoc, long description will NOT BE AVAILABLE in rst format") + + from shutil import copyfile + def convert_file(filename, ext): + copyfile(filename, os.path.splitext(filename)[0] + '.' + ext) + + IS_POSIX = os.name == 'posix' IS_MAC_OS = sys.platform == 'darwin' IS_WINDOWS = os.name == 'nt' @@ -128,7 +137,7 @@ setup(name='pympress', version=pkg_meta.__version__, description='A simple dual-screen PDF reader designed for presentations', - long_description = pypandoc.convert_file('README.md', 'rst'), + long_description = convert_file('README.md', 'rst'), author='Cimbali, Thomas Jost, Christof Rath, Epithumia', author_email='me@cimba.li', url='https://github.com/Cimbali/pympress/', diff --git a/setup.py b/setup.py index 725baa47..10d2d513 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,15 @@ from setuptools import setup import glob, sys, os.path, importlib -import pypandoc + +try: + from pypandoc import convert_file +except ImportError: + print("WARNING no pypandoc, long description will NOT BE AVAILABLE in rst format") + + from shutil import copyfile + def convert_file(filename, ext): + copyfile(filename, os.path.splitext(filename)[0] + '.' + ext) #get version pkg_meta = importlib.import_module('pympress.__init__') @@ -30,7 +38,7 @@ setup(name='pympress', version=pkg_meta.__version__, description='A simple dual-screen PDF reader designed for presentations', - long_description = pypandoc.convert_file('README.md', 'rst'), + long_description = convert_file('README.md', 'rst'), author='Cimbali, Thomas Jost, Christof Rath, Epithumia', author_email='me@cimba.li', url='https://github.com/Cimbali/pympress/',