From 369858504b69a0da34e8a431d0dedcd782f7fc80 Mon Sep 17 00:00:00 2001 From: Joel Baxter Date: Tue, 19 Nov 2013 14:52:40 -0800 Subject: [PATCH] even more doc tweaks Get the RTD links back into the long_description. Done for now? --- HISTORY.rst | 2 +- README.rst | 2 ++ README.rst.in | 8 +------- docs/rtdlinks.txt | 8 ++++++++ setup.py | 4 +++- 5 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 docs/rtdlinks.txt diff --git a/HISTORY.rst b/HISTORY.rst index e8320f3..6fc45f5 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,4 +1,4 @@ -Changelog for expak +Changelog =================== - **0.9** (2013-11-19) diff --git a/README.rst b/README.rst index b41712e..3b7a205 100644 --- a/README.rst +++ b/README.rst @@ -46,3 +46,5 @@ Documentation .. _expak module: http://expak.readthedocs.org/en/latest/expak.html .. _simple expak utility: http://expak.readthedocs.org/en/latest/simple_expak.html + + diff --git a/README.rst.in b/README.rst.in index f5b59f6..07fe28a 100644 --- a/README.rst.in +++ b/README.rst.in @@ -26,11 +26,5 @@ available among the `downloads for expak`_ at the Python Package Index (PyPI) .. _pip: http://www.pip-installer.org/en/latest .. _downloads for expak: https://pypi.python.org/pypi/expak#downloads -Documentation -============= +.. include:: docs/rtdlinks.txt -- `expak module`_ -- `simple expak utility`_ - -.. _expak module: http://expak.readthedocs.org/en/latest/expak.html -.. _simple expak utility: http://expak.readthedocs.org/en/latest/simple_expak.html diff --git a/docs/rtdlinks.txt b/docs/rtdlinks.txt new file mode 100644 index 0000000..5177985 --- /dev/null +++ b/docs/rtdlinks.txt @@ -0,0 +1,8 @@ +Documentation +============= + +- `expak module`_ +- `simple expak utility`_ + +.. _expak module: http://expak.readthedocs.org/en/latest/expak.html +.. _simple expak utility: http://expak.readthedocs.org/en/latest/simple_expak.html diff --git a/setup.py b/setup.py index 8ca26d7..d9d84a7 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,9 @@ def find_version(*file_paths): return version_match.group(1) raise RuntimeError("Unable to find version string.") -long_description = read('docs', 'blurb.txt') + '\n\n' + read('HISTORY.rst') +long_description = '\n\n'.join([read('docs', 'blurb.txt'), + read('docs', 'rtdlinks.txt'), + read('HISTORY.rst')]) class PyTest(TestCommand): def finalize_options(self):