From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 27 Dec 2017 20:10:45 +0000 (-0500)
Subject: Version 1.2.1 placeholder
X-Git-Tag: rel_1_2_1~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51f404b44892ec04b423e491f47a01850dfd38a1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Version 1.2.1 placeholder

Change-Id: I86523071ec947e368464411de3666cffb11fab6b
---

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 8db9deb36e..2528d3997b 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.1
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.0
     :released: December 27, 2017
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 4d280b382e..fefa34e3c8 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.0'
+__version__ = '1.2.1'
 
 
 def __go(lcls):