- switch master to be 1.0

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
new file mode 100644 (file)
index 0000000..d15ca76
--- /dev/null
+++ b/doc/build/changelog/changelog_10.rst
@@ -0,0 +1,17 @@
+==============
+1.0 Changelog
+==============
+
+.. changelog_imports::
+
+    .. include:: changelog_09.rst
+        :start-line: 5
+
+    .. include:: changelog_08.rst
+        :start-line: 5
+
+    .. include:: changelog_07.rst
+        :start-line: 5
+
+.. changelog::
+       :version: 1.0.0
\ No newline at end of file

diff --git a/doc/build/changelog/index.rst b/doc/build/changelog/index.rst
index f3542d5420926bdf4272b6c2ab986080d4f2b527..0f5d090a305837abec02b212f8faa60fa2b89c46 100644 (file)
--- a/doc/build/changelog/index.rst
+++ b/doc/build/changelog/index.rst
@@ -12,7 +12,7 @@ Current Migration Guide
 .. toctree::
        :maxdepth: 1
 
-       migration_09
+       migration_10
 
 Change logs
 -----------
@@ -20,6 +20,7 @@ Change logs
 .. toctree::
    :maxdepth: 2
 
+   changelog_10
    changelog_09
    changelog_08
    changelog_07
@@ -37,6 +38,7 @@ Older Migration Guides
 .. toctree::
    :maxdepth: 1
 
+   migration_09
    migration_08
    migration_07
    migration_06

diff --git a/doc/build/changelog/migration_10.rst b/doc/build/changelog/migration_10.rst
new file mode 100644 (file)
index 0000000..ac287af
--- /dev/null
+++ b/doc/build/changelog/migration_10.rst
@@ -0,0 +1,44 @@
+==============================
+What's New in SQLAlchemy 1.0?
+==============================
+
+.. admonition:: About this Document
+
+    This document describes changes between SQLAlchemy version 0.9,
+    undergoing maintenance releases as of May, 2014,
+    and SQLAlchemy version 1.0, as of yet unreleased.
+
+    Document last updated: May 23, 2014
+
+Introduction
+============
+
+This guide introduces what's new in SQLAlchemy version 1.0,
+and also documents changes which affect users migrating
+their applications from the 0.9 series of SQLAlchemy to 1.0.
+
+Please carefully review
+:ref:`behavioral_changes_orm_10` and :ref:`behavioral_changes_core_10` for
+potentially backwards-incompatible changes.
+
+
+.. _behavioral_changes_orm_10:
+
+Behavioral Changes - ORM
+========================
+
+.. _behavioral_changes_core_10:
+
+Behavioral Changes - Core
+=========================
+
+
+New Features
+============
+
+
+Behavioral Improvements
+=======================
+
+Dialect Changes
+===============

diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst
index 22b903d28965cbd1d189eff3a0d13f01b53edd7b..6c6905b22bff726c85ac159c7620bc7bbf334826 100644 (file)
--- 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 0.9** of SQLAlchemy:
+A quick check to verify that we are on at least **version 1.0** of SQLAlchemy:
 
 .. sourcecode:: pycon+sql
 
     >>> import sqlalchemy
     >>> sqlalchemy.__version__ # doctest:+SKIP
-    0.9.0
+    1.0.0
 
 Connecting
 ==========

diff --git a/doc/build/index.rst b/doc/build/index.rst
index 716a83d0e8b570196056c045c64853d7e31af782..22b5307205e067ef4f3d3e0d2817f538d901df7e 100644 (file)
--- a/doc/build/index.rst
+++ b/doc/build/index.rst
@@ -14,7 +14,7 @@ A high level view and getting set up.
 :ref:`Overview <overview>` |
 :ref:`Installation Guide <installation>` |
 :doc:`Frequently Asked Questions <faq>` |
-:doc:`Migration from 0.8 <changelog/migration_09>` |
+:doc:`Migration from 0.9 <changelog/migration_10>` |
 :doc:`Glossary <glossary>` |
 :doc:`Changelog catalog <changelog/index>`
 

diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index 02b5002f2b45bdfda15239f5fe558df4b4274925..3fc46ba02d93644e6aeb64769b2ce303f66d33b3 100644 (file)
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -189,7 +189,7 @@ the available DBAPIs for each database, including external links.
 Checking the Installed SQLAlchemy Version
 ------------------------------------------
 
-This documentation covers SQLAlchemy version 0.9. If you're working on a
+This documentation covers SQLAlchemy version 1.0. 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
-     0.9.0
+     1.0.0
 
 .. _migration:
 
-0.8 to 0.9 Migration
+0.9 to 1.0 Migration
 =====================
 
-Notes on what's changed from 0.8 to 0.9 is available here at :doc:`changelog/migration_09`.
+Notes on what's changed from 0.9 to 1.0 is available here at :doc:`changelog/migration_10`.

diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst
index 9a10506803ddd84728e09d0a14db0cebfc030f44..1fc05c4f86946b42ba9cab947818412149ce7f7d 100644 (file)
--- 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 0.9** of SQLAlchemy::
+A quick check to verify that we are on at least **version 1.0** of SQLAlchemy::
 
     >>> import sqlalchemy
     >>> sqlalchemy.__version__ # doctest:+SKIP
-    0.9.0
+    1.0.0
 
 Connecting
 ==========

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 8d77acc279f690d9dcb3aa59d638873ee51c7424..01d1f3a8d70d4b44817a7d0baf17d673c92b7941 100644 (file)
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -116,7 +116,7 @@ from .schema import (
 from .inspection import inspect
 from .engine import create_engine, engine_from_config
 
-__version__ = '0.9.5'
+__version__ = '1.0.0'
 
 def __go(lcls):
     global __all__