CHANGES.txt -> CHANGELOG.rst + RST fixup, README.txt -> README.rst

CHANGES.txt → CHANGELOG.rst

+-------
+History
+-------
+
 4.6 (2021-06-08)
-================
+----------------
 
 * Fix leaking temporary files with templates from URLs
 
 4.5 (2020-01-08)
-================
+----------------
 
 * jinja2: Prevent 'once' from overwriting 'rendered'
 
 4.4 (2019-01-24)
-================
+----------------
 
 * jinja2: add bytes and six
 
 4.3 (2018-01-25)
-================
+----------------
 
 * jinja2: Compile the same source only once and use compiled source next time.
 
 4.2 (2017-12-12)
-================
+----------------
 
 * jinja2: try to not rewrite on update if there's no change
 
 4.1 (2017-10-18)
-================
+----------------
 
 * Fix $$ escaping in basic templates.
 
 4.0 (2017-10-13)
-================
+----------------
 
 * jinja2: read template at install/update and fix 'mode' option
 * Add support for Python 3.
 
 3.0 (2017-05-23)
-================
+----------------
 
 * jinja2: make 'import' return the leaf module instead of the root one.
 
 2.10 (2017-01-18)
-=================
+-----------------
 
 * jinja2: Add support for render-once.
 
 2.9 (2015-11-18)
-================
+----------------
 
 * jinja2: Add support for non-ascii templates.
   Encoding for input/output and imported files can be set via new "encoding"
   parameter which defaults to utf-8.
 
 2.8 (2015-06-25)
-================
+----------------
 
 * jinja2: new assert function.
 
 2.7 (2015-05-18)
-================
+----------------
 
 * jinja2: fix display of source in traceback when there is an error in the
   root template (or in instance parameters).
 
 2.6 (2014-11-26)
-================
+----------------
 
  * jinja2: add many built-in functions from Python.
 
 2.5 (2013-08-07)
-================
+----------------
 
  * Fix file import with Jinja2 >= 2.7
 
 2.4.3 (2013-08-02)
-==================
+------------------
 
  * jinja2: add support for inline templates.
 
 2.4.2 (2012-08-21)
-==================
+------------------
 
  * jinja2: Mode shall be used instead of umask. [Vincent Pelletier]
  * jinja2: Add jinja2 "import" directive support. [Vincent Pelletier,
@@ -87,12 +91,12 @@
  * Reworked loader classes [Vincent Pelletier]
 
 2.4.1 (2012-08-01)
-==================
+------------------
 
  * jinja2: Make "context" parameter really optional. [Vincent Pelletier]
 
 2.4 (2012-06-01)
-================
+----------------
 
  * Provide access to zc.buildout.buildout.dumps when it exists. [Vincent
    Pelletier]
@@ -101,28 +105,28 @@
    Pelletier]
 
 2.3 (2012-03-29)
-================
+----------------
 
  * Add jinja2 entry point with jinja2 template support. [Vincent Pelletier]
 
 2.2 (2011-10-12)
-================
+----------------
 
  * Include missing files in package. [Łukasz Nowak]
 
 2.1 (2011-10-12)
-================
+----------------
 
  * Description update. [Łukasz Nowak]
 
 2.0 (2011-10-12)
-================
+----------------
 
  * Dropping collective.recipe.template dependency. [Romain Courteaud, Antoine
    Catton]
 
 1.1 (2011-05-30)
-================
+----------------
 
  * Moved out from slapos.cookbook in order to minimise depenencies [Łukasz
    Nowak]

MANIFEST.in

-include CHANGES.txt
+include CHANGELOG.rst
 include slapos/recipe/template/README.txt
 include slapos/recipe/template/README.jinja2.txt

setup.py

@@ -3,12 +3,11 @@ import os
 
 version = '4.6'
 name = 'slapos.recipe.template'
-long_description = open("README.txt").read() + "\n" + \
-    open(os.path.join('slapos', 'recipe',
-                      'template', "README.txt")).read() + "\n" + \
-    open(os.path.join('slapos', 'recipe',
-                      'template', "README.jinja2.txt")).read() + "\n" + \
-    open("CHANGES.txt").read() + "\n"
+long_description = '\n'.join((open(path).read() for path in (
+    "README.rst",
+    os.path.join('slapos', 'recipe', 'template', "README.txt"),
+    os.path.join('slapos', 'recipe', 'template', "README.jinja2.txt"),
+    "CHANGELOG.rst")))
 
 setup(name=name,
       version=version,