From afcee9f6f12b2baf86efebeaa342984ecf3bd3dc Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 24 Nov 2014 13:53:18 -0800
Subject: [PATCH 1/2] Document our explicit Python version support.

---
 README.rst | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/README.rst b/README.rst
index c09c37a0a643..00036c023f54 100644
--- a/README.rst
+++ b/README.rst
@@ -92,6 +92,37 @@ Contributions to this library are always welcome and highly encouraged.
 See `CONTRIBUTING <CONTRIBUTING.rst>`__ for more information on how to
 get started.
 
+Supported Python Versions
+-------------------------
+
+We support:
+
+-  `Python 2.6 <https://docs.python.org/2.6/>`__
+-  `Python 2.7 <https://docs.python.org/2.7/>`__
+
+We plan to support:
+
+-  `Python 3.3 <https://docs.python.org/3.3/>`__
+-  `Python 3.4 <https://docs.python.org/3.4/>`__
+
+Supported versions can be found in our ``tox.ini``
+`config <https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/tox.ini>`__.
+
+We explicitly decided not to support
+`Python 2.5 <https://docs.python.org/2.5/>`__ due to
+`decreased usage <https://caremad.io/2013/10/a-look-at-pypi-downloads/>`__ and
+lack of continuous integration
+`support <http://blog.travis-ci.com/2013-11-18-upcoming-build-environment-updates/>`__.
+
+We also explicitly decided to support Python 3 beginning with version 3.3.
+Reasons for this include:
+
+-  Encouraging use of newest versions of Python 3
+-  Taking the lead of prominent open-source
+   `projects <http://flask.pocoo.org/docs/0.10/python3/>`__
+-  Unicode literal `support <https://www.python.org/dev/peps/pep-0414>`__ which
+   allows for a cleaner codebase that works in both Python 2 and Python 3.
+
 License
 -------
 

From 7415ea11f60ff706d1c3c88d42bf9d535569a08a Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 24 Nov 2014 14:15:12 -0800
Subject: [PATCH 2/2] Removing Python 2.5 from setup.py.

---
 setup.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index e7328f4c0991..d8fdaaba0534 100644
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,8 @@
     from distutils.core import setup, find_packages
 
 
-if sys.version_info <= (2, 4):
-    raise Exception('Requires Python Version 2.5 or above... exiting.')
+if sys.version_info <= (2, 5):
+    raise Exception('Requires Python Version 2.6 or above... exiting.')
 
 
 REQUIREMENTS = [
@@ -43,7 +43,6 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Internet',