From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 10 Mar 2017 19:08:09 +0000 (-0500)
Subject: - begin the 1.2 branch in master, diverge from 1.1
X-Git-Tag: rel_1_2_0b1~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e82df50d9853a5a6a1c2d982ebd020918bf9dd3a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- begin the 1.2 branch in master, diverge from 1.1

Change-Id: I446f7528046873bf2d547daec043737b1bffe5f4
---

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
new file mode 100644
index 0000000000..009f5b9745
--- /dev/null
+++ b/doc/build/changelog/changelog_12.rst
@@ -0,0 +1,14 @@
+==============
+1.2 Changelog
+==============
+
+.. changelog_imports::
+
+    .. include:: changelog_11.rst
+        :start-line: 5
+
+    .. include:: changelog_10.rst
+        :start-line: 5
+
+.. changelog::
+    :version: 1.2.0b1
diff --git a/doc/build/conf.py b/doc/build/conf.py
index bf2f72554e..ee752c4727 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -105,11 +105,11 @@ copyright = u'2007-2017, the SQLAlchemy authors and contributors'
 # built documents.
 #
 # The short X.Y version.
-version = "1.1"
+version = "1.2"
 # The full version, including alpha/beta/rc tags.
-release = "1.1.6"
+release = "1.2.0b1"
 
-release_date = "Feburary 28, 2017"
+release_date = None
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 972964acba..2c3f53405a 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -128,7 +128,7 @@ from .schema import (
 from .inspection import inspect
 from .engine import create_engine, engine_from_config
 
-__version__ = '1.1.7'
+__version__ = '1.2.0b1'
 
 
 def __go(lcls):