From 5a2fbbba8a864bdf24da4bd6ebe0c52d0dccd21d Mon Sep 17 00:00:00 2001
From: Eli Collins <elic@assurancetechnologies.com>
Date: Thu, 26 Dec 2013 16:04:44 -0500
Subject: updated tox.ini with notes about different environments

---
 docs/install.rst |  7 +++++++
 tox.ini          | 19 +++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/docs/install.rst b/docs/install.rst
index 775e4d2..38ea7b7 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -20,6 +20,13 @@ as it contains builtin fallbacks
 for almost all OS-dependant features.
 Google App Engine is supported as well.
 
+.. warning::
+
+    Unless significant feedback is received to reverse the decision,
+    **Passlib 1.7 will drop support for Python 2.5.** Too many core tools
+    (such as Setuptools, Pip, and Tox) no longer support it, making
+    testing increasingly burdensome.
+
 .. _optional-libraries:
 
 Optional Libraries
diff --git a/tox.ini b/tox.ini
index 82b356d..81652e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,6 +30,15 @@
 #  py27 - tests bcrypt & bcryptor (so they can be cross-checked)
 #  py33 - tests bcrypt
 #  py-bcrypt - tests py-bcrypt & bcryptor (so they can be cross-checked)
+#
+# environments not in default list
+#  py25 - running tests separately, no longer supported by
+#         tox/setuptools/pip without lots of effort
+#  jython25 - same as py25
+#  jython27 - not testable even outside of tox: easy_install etc don't work,
+#             primarily due to http://bugs.jython.org/issue2066
+#             and probably http://bugs.jython.org/issue2016 as well.
+#  gae25 - no longer supported by gae sdk, and would be same as py25 otherwise
 #===========================================================================
 
 #===========================================================================
@@ -37,7 +46,7 @@
 #===========================================================================
 [tox]
 minversion=1.4
-envlist = py27,py33,py26,py31,py32,pypy,pypy3,py-bcrypt,py-bcrypt-py3,django12,django13,django14,django15,django,django-py3,gae27,jython27
+envlist = py27,py33,py26,py31,py32,pypy,pypy3,py-bcrypt,py-bcrypt-py3,django12,django13,django14,django15,django,django-py3,gae27
 
 #===========================================================================
 # stock CPython VMs
@@ -67,6 +76,9 @@ deps =
     M2Crypto
 
 [testenv:py31]
+# NOTE: getting this to work under pip-1.4.1 requires hacking in fix
+#       to deal with https://github.com/pypa/pip/issues/1105
+#       into virtualenv_support package.
 deps =
     nose
     unittest2py3k
@@ -174,9 +186,12 @@ deps =
     {[testenv:py32]deps}
 
 #===========================================================================
-# Jython - no special directives, currently same as py25
+# Jython VM
 #===========================================================================
 
+[testenv:jython27]
+basepython = jython2.7
+
 #===========================================================================
 # Google App Engine integration
 # NOTE: for this to work, the GAE SDK should be installed in
-- 
cgit v1.2.1