From 3180f15837cc5b62f1a5798c112fe1c74898103a Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 24 Jul 2015 18:27:45 -0400 Subject: [PATCH] - Organize the tree for 1.1 --- doc/build/changelog/changelog_11.rst | 23 ++++++++++ doc/build/changelog/index.rst | 4 +- doc/build/changelog/migration_11.rst | 67 ++++++++++++++++++++++++++++ doc/build/conf.py | 6 +-- doc/build/core/tutorial.rst | 4 +- doc/build/index.rst | 2 +- doc/build/intro.rst | 10 ++--- doc/build/orm/tutorial.rst | 4 +- lib/sqlalchemy/__init__.py | 2 +- 9 files changed, 107 insertions(+), 15 deletions(-) create mode 100644 doc/build/changelog/changelog_11.rst create mode 100644 doc/build/changelog/migration_11.rst diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst new file mode 100644 index 0000000000..1f18d6d16d --- /dev/null +++ b/doc/build/changelog/changelog_11.rst @@ -0,0 +1,23 @@ + + +============== +1.1 Changelog +============== + +.. changelog_imports:: + + .. include:: changelog_10.rst + :start-line: 5 + + .. include:: changelog_09.rst + :start-line: 5 + + .. include:: changelog_08.rst + :start-line: 5 + + .. include:: changelog_07.rst + :start-line: 5 + +.. changelog:: + :version: 1.1.0b1 + diff --git a/doc/build/changelog/index.rst b/doc/build/changelog/index.rst index 8c5be99b84..a9f294e877 100644 --- a/doc/build/changelog/index.rst +++ b/doc/build/changelog/index.rst @@ -12,7 +12,7 @@ Current Migration Guide .. toctree:: :titlesonly: - migration_10 + migration_11 Change logs ----------- @@ -20,6 +20,7 @@ Change logs .. toctree:: :titlesonly: + changelog_11 changelog_10 changelog_09 changelog_08 @@ -38,6 +39,7 @@ Older Migration Guides .. toctree:: :titlesonly: + migration_10 migration_09 migration_08 migration_07 diff --git a/doc/build/changelog/migration_11.rst b/doc/build/changelog/migration_11.rst new file mode 100644 index 0000000000..2775b3d88a --- /dev/null +++ b/doc/build/changelog/migration_11.rst @@ -0,0 +1,67 @@ +============================== +What's New in SQLAlchemy 1.1? +============================== + +.. admonition:: About this Document + + This document describes changes between SQLAlchemy version 1.0, + at the moment the current release series of SQLAlchemy, + and SQLAlchemy version 1.1, which is the current development + series of SQLAlchemy. + + As the 1.1 series is under development, issues that are targeted + at this series can be seen under the + `1.1 milestone `_. + Please note that the set of issues within the milestone is not fixed; + some issues may be moved to later milestones in order to allow + for a timely release. + + Document last updated: July 24, 2015. + +Introduction +============ + +This guide introduces what's new in SQLAlchemy version 1.1, +and also documents changes which affect users migrating +their applications from the 1.0 series of SQLAlchemy to 1.1. + +Please carefully review the sections on behavioral changes for +potentially backwards-incompatible changes in behavior. + +Platform Changes +================ + +New Features and Improvements - ORM +=================================== + + +New Features and Improvements - Core +==================================== + + +Key Behavioral Changes - ORM +============================ + + +Key Behavioral Changes - Core +============================= + + +Dialect Improvements and Changes - Postgresql +============================================= + + +Dialect Improvements and Changes - MySQL +============================================= + + +Dialect Improvements and Changes - SQLite +============================================= + + +Dialect Improvements and Changes - SQL Server +============================================= + + +Dialect Improvements and Changes - Oracle +============================================= diff --git a/doc/build/conf.py b/doc/build/conf.py index f1ebda46e2..e19078a870 100644 --- a/doc/build/conf.py +++ b/doc/build/conf.py @@ -136,11 +136,11 @@ copyright = u'2007-2015, the SQLAlchemy authors and contributors' # built documents. # # The short X.Y version. -version = "1.0" +version = "1.1" # The full version, including alpha/beta/rc tags. -release = "1.0.8" +release = "1.1.0b1" -release_date = "July 22, 2015" +release_date = "not released" 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 cc2a976253..c164dea4f1 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.0** of SQLAlchemy: +A quick check to verify that we are on at least **version 1.1** of SQLAlchemy: .. sourcecode:: pycon+sql >>> import sqlalchemy >>> sqlalchemy.__version__ # doctest:+SKIP - 1.0.0 + 1.1.0 Connecting ========== diff --git a/doc/build/index.rst b/doc/build/index.rst index 1990df8e20..a28dfca826 100644 --- a/doc/build/index.rst +++ b/doc/build/index.rst @@ -14,7 +14,7 @@ A high level view and getting set up. :doc:`Overview ` | :ref:`Installation Guide ` | :doc:`Frequently Asked Questions ` | -:doc:`Migration from 0.9 ` | +:doc:`Migration from 1.0 ` | :doc:`Glossary ` | :doc:`Changelog catalog ` diff --git a/doc/build/intro.rst b/doc/build/intro.rst index 3231bfe9c0..ed4838bce3 100644 --- a/doc/build/intro.rst +++ b/doc/build/intro.rst @@ -108,7 +108,7 @@ downloaded from Pypi and installed in one step:: This command will download the latest **released** version of SQLAlchemy from the `Python Cheese Shop `_ and install it to your system. -In order to install the latest **prerelease** version, such as ``1.0.0b1``, +In order to install the latest **prerelease** version, such as ``1.1.0b1``, pip requires that the ``--pre`` flag be used:: pip install --pre SQLAlchemy @@ -189,7 +189,7 @@ the available DBAPIs for each database, including external links. Checking the Installed SQLAlchemy Version ------------------------------------------ -This documentation covers SQLAlchemy version 1.0. If you're working on a +This documentation covers SQLAlchemy version 1.1. If you're working on a system that already has SQLAlchemy installed, check the version from your Python prompt like this: @@ -197,11 +197,11 @@ Python prompt like this: >>> import sqlalchemy >>> sqlalchemy.__version__ # doctest: +SKIP - 1.0.0 + 1.1.0 .. _migration: -0.9 to 1.0 Migration +1.0 to 1.1 Migration ===================== -Notes on what's changed from 0.9 to 1.0 is available here at :doc:`changelog/migration_10`. +Notes on what's changed from 1.0 to 1.1 is available here at :doc:`changelog/migration_11`. diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst index 8871ce765e..e3ce6adadf 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.0** of SQLAlchemy:: +A quick check to verify that we are on at least **version 1.1** of SQLAlchemy:: >>> import sqlalchemy >>> sqlalchemy.__version__ # doctest:+SKIP - 1.0.0 + 1.1.0 Connecting ========== diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py index ad96e7e690..01496f9f22 100644 --- a/lib/sqlalchemy/__init__.py +++ b/lib/sqlalchemy/__init__.py @@ -120,7 +120,7 @@ from .schema import ( from .inspection import inspect from .engine import create_engine, engine_from_config -__version__ = '1.0.9' +__version__ = '1.1.0b1' def __go(lcls): -- 2.47.3