- 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 (file)
index 0000000..009f5b9
--- /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 bf2f72554e1d6154f719af333a11574ec01d39d6..ee752c4727dc47737ef3b9aa81ebea74fe821d41 100644 (file)
--- 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 972964acba234f38b8ae662d71d5a7eb321719f2..2c3f53405aafe646116ee9f3355311d8c498e55a 100644 (file)
--- 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):