add changelog for #555

mark changes with rst extension for github (#548) [ci skip]
pallets-eco · Oct 4, 2017 · 0ed2250 · 0ed2250
1 parent 82d458c
commit 0ed2250
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES → CHANGES.rst b/CHANGES → CHANGES.rst
@@ -12,11 +12,14 @@ In development
   by models. (`#551`_)
 - Raise the correct error when a model has a table name but no primary key.
   (`#556`_)
+- Fix ``repr`` on models that don't have an identity because they have not been
+  flushed yet. (`#555`_)
 - Allow specifying a ``max_per_page`` limit for pagination, to avoid users
   specifying high values in the request args. (`#542`_)
 
 .. _#542: https://github.com/mitsuhiko/flask-sqlalchemy/pull/542
 .. _#551: https://github.com/mitsuhiko/flask-sqlalchemy/pull/551
+.. _#555: https://github.com/mitsuhiko/flask-sqlalchemy/pull/555
 .. _#556: https://github.com/mitsuhiko/flask-sqlalchemy/pull/556
 
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include CHANGES LICENSE
+include CHANGES.rst LICENSE
 graft docs
 prune docs/_build
 recursive-exclude docs/_themes .git*

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1 +1 @@
-.. include:: ../CHANGES
+.. include:: ../CHANGES.rst
diff --git a/scripts/make-release.py b/scripts/make-release.py
@@ -20,7 +20,7 @@
 
 
 def parse_changelog():
-    with open('CHANGES') as f:
+    with open('CHANGES.rst') as f:
         lineiter = iter(f)
         for line in lineiter:
             match = re.search('^Version\s+(.*)', line.strip())