summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2018-02-22 16:05:34 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2018-02-22 16:05:34 -0500
commit680ffffe9cc60deaeb340fc8339ec7dddd14db3d (patch)
treea8e5e8ebef441e5071702892a9126e11228bccdc
parentd5745e3595738b3c17d7b8622f30a49e9bd8c668 (diff)
downloadsqlalchemy-680ffffe9cc60deaeb340fc8339ec7dddd14db3d.tar.gz
Version 1.2.5 placeholder
-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 734739959..de58e730e 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.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 267cdfaa3..77cbbde98 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):