From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 26 Oct 2013 20:57:49 +0000 (-0400)
Subject: - more updates to compatability, C extensions, building, etc.
X-Git-Tag: rel_0_9_0b1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70e24eecee436baf770bdc7d562ac5ebaccb4802;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- more updates to compatability, C extensions, building, etc.
---

diff --git a/README.py3k b/README.py3k
deleted file mode 100644
index 2afaeb6880..0000000000
--- a/README.py3k
+++ /dev/null
@@ -1,6 +0,0 @@
-=================
-PYTHON 3 SUPPORT
-=================
-
-As of SQLAlchemy 0.9, SQLAlchemy installs and runs with
-Python 3 directly, with no code changes.
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index ff170c18d2..588701ce27 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -90,13 +90,9 @@ SQLAlchemy supports installation using standard Python "distutils" or
 * **Plain Python Distutils** - SQLAlchemy can be installed with a clean
   Python install using the services provided via `Python Distutils <http://docs.python.org/distutils/>`_,
   using the ``setup.py`` script. The C extensions as well as Python 3 builds are supported.
-* **Standard Setuptools** - When using `setuptools <http://pypi.python.org/pypi/setuptools/>`_,
+* **Setuptools or Distribute** - When using `setuptools <http://pypi.python.org/pypi/setuptools/>`_,
   SQLAlchemy can be installed via ``setup.py`` or ``easy_install``, and the C
-  extensions are supported.  setuptools is not supported on Python 3 at the time
-  of this writing.
-* **Distribute** - With `distribute <http://pypi.python.org/pypi/distribute/>`_,
-  SQLAlchemy can be installed via ``setup.py`` or ``easy_install``, and the C
-  extensions as well as Python 3 builds are supported.
+  extensions are supported.  
 * **pip** - `pip <http://pypi.python.org/pypi/pip/>`_ is an installer that
   rides on top of ``setuptools`` or ``distribute``, replacing the usage
   of ``easy_install``.  It is often preferred for its simpler mode of usage.
@@ -116,6 +112,11 @@ Or with pip::
 This command will download the latest version of SQLAlchemy from the `Python
 Cheese Shop <http://pypi.python.org/pypi/SQLAlchemy>`_ and install it to your system.
 
+.. note::
+	
+    Beta releases of SQLAlchemy may not be present on Pypi, and may instead
+    require a direct download first.
+
 Installing using setup.py
 ----------------------------------
 
@@ -127,8 +128,12 @@ Installing the C Extensions
 ----------------------------------
 
 SQLAlchemy includes C extensions which provide an extra speed boost for
-dealing with result sets. Currently, the extensions are only supported on the
-2.xx series of cPython, not Python 3 or Pypy.
+dealing with result sets.   The extensions are supported on both the 2.xx
+and 3.xx series of cPython.
+
+.. versionchanged:: 0.9.0
+
+    The C extensions now compile on Python 3 as well as Python 2.
 
 setup.py will automatically build the extensions if an appropriate platform is
 detected. If the build of the C extensions fails, due to missing compiler or
@@ -154,11 +159,12 @@ Or with pip::
 Installing on Python 3
 ----------------------------------
 
-SQLAlchemy ships as Python 2 code. For Python 3 usage, the ``setup.py`` script
-will invoke the Python ``2to3`` tool on the build, plugging in an extra
-"preprocessor" as well. The 2to3 step works with Python distutils
-(part of the standard Python install) and Distribute - it will **not**
-work with a non-Distribute setuptools installation.
+SQLAlchemy runs directly on Python 2 or Python 3, and can be installed in
+either environment without any adjustments or code conversion.
+
+.. versionchanged:: 0.9.0 Python 3 is now supported in place with no 2to3 step
+   required.
+
 
 Installing a Database API
 ----------------------------------