get rid of buildout-py3k.cfg

3 files changed, 18 insertions, 25 deletions

diff --git a/buildout-py3k.cfg b/buildout-py3k.cfg
deleted file mode 100644
index 4c1585e..0000000
--- a/buildout-py3k.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-[buildout]
-newest = false
-prefer-final = true
-parts = eggs
-develop = . ../webob
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-    webtest
-    webob>=1.2
-    nose
-    six
-    lxml
-    PyQuery
-    coverage
-#    BeautifulSoup
-interpreter = python
diff --git a/requirements.txt b/requirements.txt
index 524a829..5c48bb3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,7 @@
-webob==1.1.1
+webtest[tests]
+webob>=1.2
 lxml
 pyquery
-BeautifulSoup
-simplejson
+beautifulsoup4
 Sphinx
-unittest2
-coverage
 pep8
diff --git a/setup.py b/setup.py
index bd9ef58..2fe39ce 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,18 @@
 #!/usr/bin/env python
+
+import sys
+
 from setuptools import setup
 from setuptools import find_packages
 
-version = '1.4.1'
+version = '1.4.1dev0'
+
+tests_require = ['nose', 'coverage']
+
+if sys.version_info.major == "2":
+    tests_require.append('unittest2')
+else:
+    tests_require.append('unittest2py3k')
 
 setup(name='WebTest',
       version=version,
@@ -37,7 +47,10 @@ setup(name='WebTest',
         'WebOb',
       ],
       test_suite='nose.collector',
-      tests_require=['dtopt', 'nose'],
+      tests_require=tests_require,
+      extras_require={
+            'tests': tests_require,
+      },
       entry_points="""
       [paste.app_factory]
       debug = webtest.debugapp:make_debug_app