summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2018-03-02 14:41:03 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2018-03-02 14:41:23 -0500
commit15c458d349f30af8e08b0d1fb268a968753481de (patch)
treec40f1074c048c0f8e60147694c6a3632b1b50fae
parentea36338b2e5f621287e9890deeffb6c5f6ff0874 (diff)
downloadsqlalchemy-15c458d349f30af8e08b0d1fb268a968753481de.tar.gz
Setup master as 1.3
Change-Id: I1e8240d19f891cb6575f10d93524b551d74864ea
-rw-r--r--doc/build/changelog/migration_13.rst45
-rw-r--r--doc/build/changelog/unreleased_13/README.txt12
-rw-r--r--doc/build/conf.py6
-rw-r--r--doc/build/core/tutorial.rst4
-rw-r--r--doc/build/intro.rst8
-rw-r--r--doc/build/orm/tutorial.rst4
-rw-r--r--lib/sqlalchemy/__init__.py2
7 files changed, 69 insertions, 12 deletions
diff --git a/doc/build/changelog/migration_13.rst b/doc/build/changelog/migration_13.rst
new file mode 100644
index 000000000..27c2066f7
--- /dev/null
+++ b/doc/build/changelog/migration_13.rst
@@ -0,0 +1,45 @@
+=============================
+What's New in SQLAlchemy 1.3?
+=============================
+
+.. admonition:: About this Document
+
+ This document describes changes between SQLAlchemy version 1.2
+ and SQLAlchemy version 1.3.
+
+Introduction
+============
+
+This guide introduces what's new in SQLAlchemy version 1.23
+and also documents changes which affect users migrating
+their applications from the 1.2 series of SQLAlchemy to 1.3.
+
+Please carefully review the sections on behavioral changes for
+potentially backwards-incompatible changes in behavior.
+
+New Features and Improvements - ORM
+===================================
+
+Key Behavioral Changes - ORM
+=============================
+
+New Features and Improvements - Core
+====================================
+
+Key Behavioral Changes - Core
+=============================
+
+Dialect Improvements and Changes - PostgreSQL
+=============================================
+
+Dialect Improvements and Changes - MySQL
+=============================================
+
+Dialect Improvements and Changes - SQLite
+=============================================
+
+Dialect Improvements and Changes - Oracle
+=============================================
+
+Dialect Improvements and Changes - SQL Server
+=============================================
diff --git a/doc/build/changelog/unreleased_13/README.txt b/doc/build/changelog/unreleased_13/README.txt
new file mode 100644
index 000000000..1d2b3446e
--- /dev/null
+++ b/doc/build/changelog/unreleased_13/README.txt
@@ -0,0 +1,12 @@
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts. Note that
+gerrit does not support custom merge handlers unlike
+git itself.
+
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 33b70dff6..5f8ecda95 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -108,11 +108,11 @@ copyright = u'2007-2018, the SQLAlchemy authors and contributors'
# built documents.
#
# The short X.Y version.
-version = "1.2"
+version = "1.3"
# The full version, including alpha/beta/rc tags.
-release = "1.2.4"
+release = "1.3.0b1"
-release_date = "February 22, 2018"
+release_date = None
site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
site_adapter_template = "docs_adapter.mako"
diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst
index 1069ae5c7..79057e678 100644
--- a/doc/build/core/tutorial.rst
+++ b/doc/build/core/tutorial.rst
@@ -50,13 +50,13 @@ Version Check
=============
-A quick check to verify that we are on at least **version 1.2** of SQLAlchemy:
+A quick check to verify that we are on at least **version 1.3** of SQLAlchemy:
.. sourcecode:: pycon+sql
>>> import sqlalchemy
>>> sqlalchemy.__version__ # doctest: +SKIP
- 1.2.0
+ 1.3.0
Connecting
==========
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index a64a1a23c..bc2e43f54 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -159,7 +159,7 @@ the available DBAPIs for each database, including external links.
Checking the Installed SQLAlchemy Version
------------------------------------------
-This documentation covers SQLAlchemy version 1.2. If you're working on a
+This documentation covers SQLAlchemy version 1.3. If you're working on a
system that already has SQLAlchemy installed, check the version from your
Python prompt like this:
@@ -167,11 +167,11 @@ Python prompt like this:
>>> import sqlalchemy
>>> sqlalchemy.__version__ # doctest: +SKIP
- 1.2.0
+ 1.3.0
.. _migration:
-1.1 to 1.2 Migration
+1.2 to 1.3 Migration
=====================
-Notes on what's changed from 1.1 to 1.2 is available here at :doc:`changelog/migration_12`.
+Notes on what's changed from 1.2 to 1.3 is available here at :doc:`changelog/migration_13`.
diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst
index 419e0f410..79315cada 100644
--- a/doc/build/orm/tutorial.rst
+++ b/doc/build/orm/tutorial.rst
@@ -40,11 +40,11 @@ following text represents the expected return value.
Version Check
=============
-A quick check to verify that we are on at least **version 1.2** of SQLAlchemy::
+A quick check to verify that we are on at least **version 1.3** of SQLAlchemy::
>>> import sqlalchemy
>>> sqlalchemy.__version__ # doctest:+SKIP
- 1.2.0
+ 1.3.0
Connecting
==========
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 77cbbde98..e77bd65bd 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.5'
+__version__ = '1.3.0b1'
def __go(lcls):