version bump, dependencies

zopefoundation · Apr 17, 2007 · e04ac57 · e04ac57
1 parent 292c9f5
commit e04ac57
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/buildout.cfg b/buildout.cfg
@@ -6,4 +6,5 @@ find-links = http://download.zope.org/distribution/
 
 [test]
 recipe = zc.recipe.testrunner
+defaults = ['--tests-pattern', '^f?tests$']
 eggs = z3c.traverser [test]
diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,2 @@
 [egg_info]
-tag_build = .dev
 tag_svn_revision = 1
diff --git a/setup.py b/setup.py
@@ -17,9 +17,17 @@
     namespace_packages=['z3c',],
     install_requires=[
         'setuptools',
-        'zope.component'],
+        'zope.component',
+        'zope.interface',
+        'zope.publisher',
+        'zope.traversing',
+        'zope.viewlet',
+        ],
     extras_require = dict(
-        test = ['zope.app.testing']
-        ),
+    test = ['zope.app.testing',
+            'zope.app.securitypolicy',
+            'zope.app.zcmlfiles',
+            'zope.testbrowser']
+    ),
 )
 
diff --git a/src/z3c/traverser/stackinfo/ftesting.zcml b/src/z3c/traverser/stackinfo/ftesting.zcml
@@ -1,13 +1,19 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:browser="http://namespaces.zope.org/browser"
+           xmlns:zcml="http://namespaces.zope.org/zcml"
            i18n_domain="zope">
 
-  <include package="zope.app" />
+  <include
+      zcml:condition="installed zope.app.zcmlfiles"
+      package="zope.app.zcmlfiles"
+      />
+  <include
+      zcml:condition="not-installed zope.app.zcmlfiles"
+      package="zope.app"
+      />
 
-  <include package="zope.viewlet" file="meta.zcml"/>
   <include package="zope.app.securitypolicy" file="meta.zcml" />
 
-  <include package="zope.app.server" />
   <include package="zope.app.authentication" />
   <securityPolicy
     component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />

diff --git a/src/z3c/traverser/viewlet/ftesting.zcml b/src/z3c/traverser/viewlet/ftesting.zcml
@@ -1,14 +1,23 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:browser="http://namespaces.zope.org/browser"
            xmlns:meta="http://namespaces.zope.org/meta"
+           xmlns:zcml="http://namespaces.zope.org/zcml"
            i18n_domain="zope">
 
-  <include package="zope.app" />
+  <include
+      zcml:condition="installed zope.app.zcmlfiles"
+      package="zope.app.zcmlfiles"
+      />
+  <include
+      zcml:condition="not-installed zope.app.zcmlfiles"
+      package="zope.app"
+      />
+
 
   <include package="zope.viewlet" file="meta.zcml"/>
   <include package="zope.app.securitypolicy" file="meta.zcml" />
 
-  <include package="zope.app.server" />
+
   <include package="zope.app.authentication" />
 
   <securityPolicy