- 0.9.5. setup

- changelog file setup

Change-Id: I1edd9e055740c9826c4f89d6d74fb12f5e3f58ce

diff --git a/alembic/__init__.py b/alembic/__init__.py
index 1756e49f212033a6343da937c9d4ef3581c79216..1f655bb5a6dfb38f66ed04f4122d116ea1e4e3b2 100644 (file)
--- a/alembic/__init__.py
+++ b/alembic/__init__.py
@@ -1,6 +1,6 @@
 from os import path
 
-__version__ = '0.9.4'
+__version__ = '0.9.5'
 
 package_dir = path.abspath(path.dirname(__file__))
 

diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst
index 19f97216c02fe9005a88cf3ab9667f5282b26aa0..818fd104378868c041b6c16c52719ac88e960490 100644 (file)
--- a/docs/build/changelog.rst
+++ b/docs/build/changelog.rst
@@ -3,6 +3,10 @@
 Changelog
 ==========
 
+.. changelog::
+    :version: 0.9.5
+    :include_notes_from: unreleased
+
 .. changelog::
     :version: 0.9.4
     :released: July 31, 2017

diff --git a/docs/build/requirements.txt b/docs/build/requirements.txt
index 8faaa2095ae9557d84790b250fe76f0099e552ae..aa476ac37827fa466036e2a5807a3fc73d0a31ad 100644 (file)
--- a/docs/build/requirements.txt
+++ b/docs/build/requirements.txt
@@ -1,4 +1,4 @@
-changelog>=0.3.5
-sphinx-paramlinks>=0.3.2
-python-dateutil
+git+https://bitbucket.org/zzzeek/changelog.git@HEAD#egg=changelog
+git+https://bitbucket.org/zzzeek/sphinx-paramlinks.git@HEAD#egg=sphinx-paramlinks
 git+https://bitbucket.org/zzzeek/sqlalchemy.git
+python-dateutil

diff --git a/docs/build/unreleased/README.txt b/docs/build/unreleased/README.txt
new file mode 100644 (file)
index 0000000..1d2b344
--- /dev/null
+++ b/docs/build/unreleased/README.txt
@@ -0,0 +1,12 @@
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts.   Note that
+gerrit does not support custom merge handlers unlike
+git itself.
+