Commit 34b6ebd1 by Chris Jerdonek

Fixed MANIFEST.in; setup.py now provides an error message about pandoc.

parent ea3eb8b8
include README.md include README.md
include HISTORY.md include HISTORY.md
include LICENSE include LICENSE
include DESCRIPTION.rst include setup_description.rst
include tox.ini include tox.ini
include test_pystache.py include test_pystache.py
# You cannot use package_data, for example, to include data files in a # You cannot use package_data, for example, to include data files in a
......
...@@ -164,8 +164,8 @@ def make_description_file(target_path): ...@@ -164,8 +164,8 @@ def make_description_file(target_path):
""" """
# Comments in reST begin with two dots. # Comments in reST begin with two dots.
intro = """\ intro = """\
.. This file is auto-generated by setup.py using pandoc, so any edits .. This file is auto-generated by setup.py for PyPI using pandoc, so this
.. should go in the source markdown files. .. file should not be edited. Edits should go in the source files.
""" """
readme_path = convert_md_to_rst(README_PATH) readme_path = convert_md_to_rst(README_PATH)
...@@ -224,10 +224,18 @@ def convert_md_to_rst(path): ...@@ -224,10 +224,18 @@ def convert_md_to_rst(path):
temp_path = make_temp_path(path) temp_path = make_temp_path(path)
print("Converting: %s to %s" % (path, temp_path)) print("Converting: %s to %s" % (path, temp_path))
if os.path.exists(temp_path):
os.remove(temp_path)
# Pandoc uses the UTF-8 character encoding for both input and output. # Pandoc uses the UTF-8 character encoding for both input and output.
command = "pandoc --write=rst --output=%s %s" % (temp_path, path) command = "pandoc --write=rst --output=%s %s" % (temp_path, path)
os.system(command) os.system(command)
if not os.path.exists(temp_path):
s = ("Error running: %s\n"
" Did you install pandoc per the %s docstring?" % (command, __file__))
sys.exit(s)
return temp_path return temp_path
......
.. This file is auto-generated by setup.py, so it should not be edited. .. This file is auto-generated by setup.py for PyPI using pandoc, so this
.. file should not be edited. Edits should go in the source files.
Pystache Pystache
======== ========
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment