From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 3 Aug 2017 19:24:28 +0000 (-0400)
Subject: - 0.9.5. setup
X-Git-Tag: rel_0_9_5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5c7b3469a4bdbe20f679988752f46538c23af26;p=thirdparty%2Fsqlalchemy%2Falembic.git

- 0.9.5. setup
- changelog file setup

Change-Id: I1edd9e055740c9826c4f89d6d74fb12f5e3f58ce
---

diff --git a/alembic/__init__.py b/alembic/__init__.py
index 1756e49f..1f655bb5 100644
--- 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 19f97216..818fd104 100644
--- 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 8faaa209..aa476ac3 100644
--- 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
index 00000000..1d2b3446
--- /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.
+