Skip to content

Commit

Permalink
Let people use setupy.py without (py)pandoc, but emit warning
Browse files Browse the repository at this point in the history
  • Loading branch information
Cimbali committed Mar 30, 2017
1 parent 905cdfc commit cda3b94
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
13 changes: 11 additions & 2 deletions cxfreeze_setup.py
Expand Up @@ -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'
Expand Down Expand Up @@ -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/',
Expand Down
12 changes: 10 additions & 2 deletions setup.py
Expand Up @@ -22,15 +22,23 @@

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__')

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/',
Expand Down

0 comments on commit cda3b94

Please sign in to comment.