diff options
| -rw-r--r-- | doc/build/changelog/index.rst | 4 | ||||
| -rw-r--r-- | doc/build/changelog/migration_12.rst | 57 | ||||
| -rw-r--r-- | doc/build/core/tutorial.rst | 4 | ||||
| -rw-r--r-- | doc/build/index.rst | 2 | ||||
| -rw-r--r-- | doc/build/intro.rst | 23 | ||||
| -rw-r--r-- | doc/build/orm/tutorial.rst | 4 | ||||
| -rw-r--r-- | setup.py | 5 | ||||
| -rw-r--r-- | tox.ini | 2 |
8 files changed, 76 insertions, 25 deletions
diff --git a/doc/build/changelog/index.rst b/doc/build/changelog/index.rst index a9f294e87..787d4766a 100644 --- a/doc/build/changelog/index.rst +++ b/doc/build/changelog/index.rst @@ -12,7 +12,7 @@ Current Migration Guide .. toctree:: :titlesonly: - migration_11 + migration_12 Change logs ----------- @@ -20,6 +20,7 @@ Change logs .. toctree:: :titlesonly: + changelog_12 changelog_11 changelog_10 changelog_09 @@ -39,6 +40,7 @@ Older Migration Guides .. toctree:: :titlesonly: + migration_11 migration_10 migration_09 migration_08 diff --git a/doc/build/changelog/migration_12.rst b/doc/build/changelog/migration_12.rst new file mode 100644 index 000000000..204652264 --- /dev/null +++ b/doc/build/changelog/migration_12.rst @@ -0,0 +1,57 @@ +============================== +What's New in SQLAlchemy 1.2? +============================== + +.. admonition:: About this Document + + This document describes changes between SQLAlchemy version 1.1 + and SQLAlchemy version 1.2. 1.2 is currently under development + and is unreleased. + + +Introduction +============ + +This guide introduces what's new in SQLAlchemy version 1.2, +and also documents changes which affect users migrating +their applications from the 1.1 series of SQLAlchemy to 1.2. + +Please carefully review the sections on behavioral changes for +potentially backwards-incompatible changes in behavior. + +Platform Support +================ + +Targeting Python 2.7 and Up +--------------------------- + +SQLAlchemy 1.2 now moves the minimum Python version to 2.7, no longer +supporting 2.6. New language features are expected to be merged +into the 1.2 series that were not supported in Python 2.6. For Python 3 support, +SQLAlchemy is currnetly tested on versions 3.5 and 3.6. + + +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 - Oracle +============================================= + diff --git a/doc/build/core/tutorial.rst b/doc/build/core/tutorial.rst index f42f54039..2e47aa324 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.1** of SQLAlchemy: +A quick check to verify that we are on at least **version 1.2** of SQLAlchemy: .. sourcecode:: pycon+sql >>> import sqlalchemy >>> sqlalchemy.__version__ # doctest: +SKIP - 1.1.0 + 1.2.0 Connecting ========== diff --git a/doc/build/index.rst b/doc/build/index.rst index 377ccfb41..1186e8eac 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 <intro>` | :ref:`Installation Guide <installation>` | :doc:`Frequently Asked Questions <faq/index>` | -:doc:`Migration from 1.0 <changelog/migration_11>` | +:doc:`Migration from 1.1 <changelog/migration_12>` | :doc:`Glossary <glossary>` | :doc:`Changelog catalog <changelog/index>` diff --git a/doc/build/intro.rst b/doc/build/intro.rst index 1b8991f28..a64a1a23c 100644 --- a/doc/build/intro.rst +++ b/doc/build/intro.rst @@ -70,12 +70,12 @@ Supported Platforms SQLAlchemy has been tested against the following platforms: -* cPython since version 2.6, through the 2.xx series +* cPython since version 2.7, through the 2.xx series * cPython version 3, throughout all 3.xx series * `Pypy <http://pypy.org/>`_ 2.1 or greater -.. versionchanged:: 0.9 - Python 2.6 is now the minimum Python version supported. +.. versionchanged:: 1.2 + Python 2.7 is now the minimum Python version supported. Platforms that don't currently have support include Jython and IronPython. Jython has been supported in the past and may be supported in future @@ -104,7 +104,7 @@ downloaded from Pypi and installed in one step:: This command will download the latest **released** version of SQLAlchemy from the `Python Cheese Shop <http://pypi.python.org/pypi/SQLAlchemy>`_ and install it to your system. -In order to install the latest **prerelease** version, such as ``1.1.0b1``, +In order to install the latest **prerelease** version, such as ``1.2.0b1``, pip requires that the ``--pre`` flag be used:: pip install --pre SQLAlchemy @@ -147,13 +147,6 @@ mechanism:: setuptools. -Installing on Python 3 ----------------------------------- - -SQLAlchemy runs directly on Python 2 or Python 3, and can be installed in -either environment without any adjustments or code conversion. - - Installing a Database API ---------------------------------- @@ -166,7 +159,7 @@ the available DBAPIs for each database, including external links. Checking the Installed SQLAlchemy Version ------------------------------------------ -This documentation covers SQLAlchemy version 1.1. If you're working on a +This documentation covers SQLAlchemy version 1.2. If you're working on a system that already has SQLAlchemy installed, check the version from your Python prompt like this: @@ -174,11 +167,11 @@ Python prompt like this: >>> import sqlalchemy >>> sqlalchemy.__version__ # doctest: +SKIP - 1.1.0 + 1.2.0 .. _migration: -1.0 to 1.1 Migration +1.1 to 1.2 Migration ===================== -Notes on what's changed from 1.0 to 1.1 is available here at :doc:`changelog/migration_11`. +Notes on what's changed from 1.1 to 1.2 is available here at :doc:`changelog/migration_12`. diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst index 91c6202e1..afe097e85 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.1** of SQLAlchemy:: +A quick check to verify that we are on at least **version 1.2** of SQLAlchemy:: >>> import sqlalchemy >>> sqlalchemy.__version__ # doctest:+SKIP - 1.1.0 + 1.2.0 Connecting ========== @@ -12,8 +12,8 @@ from setuptools import find_packages from setuptools.command.test import test as TestCommand cmdclass = {} -if sys.version_info < (2, 6): - raise Exception("SQLAlchemy requires Python 2.6 or higher.") +if sys.version_info < (2, 7): + raise Exception("SQLAlchemy requires Python 2.7 or higher.") cpython = platform.python_implementation() == 'CPython' @@ -148,7 +148,6 @@ def run_setup(with_cext): "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: Jython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Database :: Front-Ends", "Operating System :: OS Independent", @@ -1,6 +1,6 @@ [tox] -envlist = py{26,27,34,35,36}-{cext,nocext} +envlist = py{27,34,35,36}-{cext,nocext} [testenv] # note that we have a .coveragerc file that points coverage specifically |