From f0a9d39634d214672ab5171c7b8178abf2cbea94 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 31 Oct 2012 00:55:43 -0400 Subject: [PATCH] update the intro --- doc/build/intro.rst | 18 ++++++++---------- lib/sqlalchemy/orm/events.py | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/doc/build/intro.rst b/doc/build/intro.rst index 1493e2c4bf..fc7e1142e9 100644 --- a/doc/build/intro.rst +++ b/doc/build/intro.rst @@ -74,11 +74,14 @@ Supported Platforms SQLAlchemy has been tested against the following platforms: -* cPython since version 2.4, through the 2.xx series +* cPython since version 2.5, through the 2.xx series * cPython version 3, throughout all 3.xx series * `Jython `_ 2.5 or greater * `Pypy `_ 1.5 or greater +.. versionchanged:: 0.8 + Python 2.5 is now the minimum Python version supported. + Supported Installation Methods ------------------------------- @@ -99,11 +102,6 @@ SQLAlchemy supports installation using standard Python "distutils" or rides on top of ``setuptools`` or ``distribute``, replacing the usage of ``easy_install``. It is often preferred for its simpler mode of usage. -.. note:: - - It is strongly recommended that either ``setuptools`` or ``distribute`` be installed. - Python's built-in ``distutils`` lacks many widely used installation features. - Install via easy_install or pip ------------------------------- @@ -166,10 +164,10 @@ work with a non-Distribute setuptools installation. Installing a Database API ---------------------------------- -SQLAlchemy is designed to operate with a `DB-API -`_ implementation built for a -particular database, and includes support for the most popular databases. The -current list is at :ref:`supported_dbapis`. +SQLAlchemy is designed to operate with a :term:`DBAPI` implementation built for a +particular database, and includes support for the most popular databases. +The individual database sections in :doc:`/dialects/index` enumerate +the available DBAPIs for each database, including external links. Checking the Installed SQLAlchemy Version ------------------------------------------ diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index 8f9680911e..72c430b381 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -1102,7 +1102,7 @@ class SessionEvents(event.Events): def after_transaction_create(self, session, transaction): """Execute when a new :class:`.SessionTransaction` is created. - :param session: the target :class:.`Session`. + :param session: the target :class:`.Session`. :param transaction: the target :class:`.SessionTransaction`. .. versionadded:: 0.8 @@ -1112,7 +1112,7 @@ class SessionEvents(event.Events): def after_transaction_end(self, session, transaction): """Execute when the span of a :class:`.SessionTransaction` ends. - :param session: the target :class:.`Session`. + :param session: the target :class:`.Session`. :param transaction: the target :class:`.SessionTransaction`. .. versionadded:: 0.8 -- 2.47.3