fix .travis.yml, tox.ini

python 2.5 needs an older webob version. so, we add the dependency in
tox.ini. we use tox to run the tests on travis.

remove python 3.3 from travis.yml as it's not there yet.

.travis-runtox.py

@@ -0,0 +1,15 @@
+#! /usr/bin/env python
+
+
+def main():
+    import sys, os
+    if hasattr(sys, "pypy_version_info"):
+        v = "pypy"
+    else:
+        v = "py%s%s" % (sys.version_info[:2])
+
+    os.execvp("tox", ["tox", "-e", v])
+
+
+if __name__ == "__main__":
+    main()

.travis.yml

@@ -4,8 +4,10 @@ python:
   - 2.5
   - 2.6
   - 2.7
+  - 3.2
   - pypy
 
-before_install: pip install --use-mirrors pytest twill paste pastedeploy
+before_install: pip install --use-mirrors tox
+
 install: python setup.py install
-script: py.test
+script: ./.travis-runtox.py

make_manifest.py

@@ -6,7 +6,7 @@ import os
 def main():
     files = sorted(set([x.strip() for x in os.popen("git ls-files")]) -
                    set(("make_manifest.py", "commit-standalone",
-                        "vendor", ".gitmodules", ".travis.yml")))
+                        "vendor", ".gitmodules", ".travis.yml", ".travis-runtox.py")))
     with open("MANIFEST.in", "w") as f:
         for x in files:
             f.write("include %s\n" % x)

tox.ini

@@ -7,3 +7,9 @@ deps=pytest>=2.3
      beautifulsoup4
 commands=py.test []
 sitepackages=False
+
+[testenv:py25]
+deps=pytest>=2.3
+     WebTest==1.4.3
+     WebOb==0.9.6.1
+     BeautifulSoup==3.2.1