Depend on new "Chameleon" package (rather than individual chameleon.zpt and chameleon.core packages).

Somehow we also need to depend on sourcecodegen or the tests fail (even though Chameleon depends on them too).

Don't run coverage tests by default when running nosetests (pass --with-coverage to "setup.py nosetests" to obtain the older behavior).

Ignore .coverage in trunk/repoze/bfg

Pass where=repoze/bfg to avoid running other repoze tests, for whatever reason.

2 files changed, 3 insertions, 3 deletions

diff --git a/setup.cfg b/setup.cfg
index eeb4ff507..5b41e17e5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,8 +4,8 @@ index_url = http://dist.repoze.org/bfg/dev/simple
 
 [nosetests]
 match=^test
+where=repoze/bfg
 nocapture=1
 cover-package=repoze.bfg
-with-coverage=1
 cover-erase=1
 
diff --git a/setup.py b/setup.py
index 51cbc3775..7c78677b3 100644
--- a/setup.py
+++ b/setup.py
@@ -28,8 +28,8 @@ except IOError:
 
 install_requires=[
     'setuptools',
-    'chameleon.core >= 1.0b32',  # non-lxml version
-    'chameleon.zpt >= 1.0b16',   # newest version as of non-xml core release
+    'Chameleon',
+    'sourcecodegen>=0.6.11', # tests fail without this requirement?  (wtf)
     'Paste',
     'PasteDeploy',
     'PasteScript',