From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 10 Nov 2018 20:59:12 +0000 (-0500)
Subject: Version 1.2.15 placeholder
X-Git-Tag: rel_1_2_15~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6726c60e4cff0d1f157c2fab1b2a79ad2d2182a4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Version 1.2.15 placeholder
---

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 58ea4c896f..dc1d73dbfa 100644
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -10,6 +10,10 @@
     .. include:: changelog_10.rst
         :start-line: 5
 
+.. changelog::
+    :version: 1.2.15
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.14
     :released: November 10, 2018
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 286dcd4fbf..21143f56b8 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -130,7 +130,7 @@ from .schema import (
 from .inspection import inspect
 from .engine import create_engine, engine_from_config
 
-__version__ = '1.2.14'
+__version__ = '1.2.15'
 
 
 def __go(lcls):