From 795253eefe30d8799a55d31e9905c6af21a32ffb Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 24 Sep 2011 18:57:20 -0400
Subject: fix setup.py and tox.ini for dev/testing purposes

---
 setup.py | 14 ++++----------
 tox.ini  | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index 99771a941..08aa1643e 100644
--- a/setup.py
+++ b/setup.py
@@ -13,13 +13,14 @@
 ##############################################################################
 
 import os
-import platform
 import sys
 
 from setuptools import setup, find_packages
 
+if sys.version_info[:2] < (2, 6):
+    raise RuntimeError('Requires Python 2.6 or better')
+
 PY3 = sys.version_info[0] == 3
-JYTHON = platform.system() != 'Java'
 
 here = os.path.abspath(os.path.dirname(__file__))
 try:
@@ -52,21 +53,14 @@ tests_require = install_requires + [
     'virtualenv',
     ]
 
-if not (JYTHON or PY3):
+if not PY3:
     tests_require.extend([
         'Sphinx',
         'docutils',
         'repoze.sphinx.autointerface',
-        ])
-
-if not PY3:
-    tests_require.extend([
         'zope.component>=3.11.0',
         ])
 
-if sys.version_info[:2] < (2, 6):
-    install_requires.append('simplejson')
-    
 setup(name='pyramid',
       version='1.2',
       description=('The Pyramid web application development framework, a '
diff --git a/tox.ini b/tox.ini
index 58980e805..a422b2eb6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,25 @@
 [tox]
 envlist = 
-    py26,py27,jython,pypy,cover
+    py26,py27,py32,pypy,cover
 
 [testenv]
 commands = 
     python setup.py test -q
 deps =
+    https://github.com/Pylons/webob/zipball/master
+    zope.component
     Sphinx
-    WebTest
     repoze.sphinx.autointerface
+    WebTest
     virtualenv
 
-[testenv:jython]
+[testenv:py32]
 commands = 
-   jython setup.py test -q
+    python setup.py test -q
+deps =
+    https://github.com/Pylons/webob/zipball/master
+    WebTest
+    virtualenv
 
 [testenv:cover]
 basepython =
@@ -21,6 +27,8 @@ basepython =
 commands = 
     python setup.py nosetests --with-xunit --with-xcoverage
 deps =
+    https://github.com/Pylons/webob/zipball/master
+    zope.component
     Sphinx
     WebTest
     repoze.sphinx.autointerface
-- 
cgit v1.2.3