From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 22 Feb 2018 21:05:34 +0000 (-0500)
Subject: Version 1.2.5 placeholder
X-Git-Tag: rel_1_2_5~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=680ffffe9cc60deaeb340fc8339ec7dddd14db3d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Version 1.2.5 placeholder
---

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 7347399593..de58e730e1 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.5
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.4
     :released: February 22, 2018
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 267cdfaa3a..77cbbde98c 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.4'
+__version__ = '1.2.5'
 
 
 def __go(lcls):