summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/build/changelog/changelog_12.rst4
-rw-r--r--lib/sqlalchemy/__init__.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 8db9deb36..2528d3997 100644
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -11,6 +11,10 @@
: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 4d280b382..fefa34e3c 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):