[Checkins] SVN: z3c.profiler/trunk/ - Fixed `bin/app` by requiring ``zope.login``.

Michael Howitz mh at gocept.com
Thu Aug 19 16:30:45 EDT 2010


Log message for revision 115811:
  - Fixed `bin/app` by requiring ``zope.login``.
  
  - Removed some not needed dependecies: ``zope.app.generations``,
    ``zope.app.pagetemplate``, ``z3c.coverage``.
  
  - Moved dependency on ``zope.app.server`` to an `app` extra in ``setup.py``
    as the tests do not need it and the profiler may be used in a WSGI
    application then it is not needed, too.
  
  - Declared ``zope.dublincore`` in `app` extra, too, as it is not needed by
    the tests but `bin/app` requires now version 3.7 to run.
  

Changed:
  U   z3c.profiler/trunk/CHANGES.txt
  U   z3c.profiler/trunk/buildout.cfg
  U   z3c.profiler/trunk/setup.py
  U   z3c.profiler/trunk/src/z3c/profiler/setup.zcml

-=-
Modified: z3c.profiler/trunk/CHANGES.txt
===================================================================
--- z3c.profiler/trunk/CHANGES.txt	2010-08-19 20:15:02 UTC (rev 115810)
+++ z3c.profiler/trunk/CHANGES.txt	2010-08-19 20:30:44 UTC (rev 115811)
@@ -8,7 +8,19 @@
 - Using python's ``doctest`` module instead of deprecated
   ``zope.testing.doctest``.
 
+- Fixed `bin/app` by requiring ``zope.login``.
 
+- Removed some not needed dependecies: ``zope.app.generations``,
+  ``zope.app.pagetemplate``, ``z3c.coverage``.
+
+- Moved dependency on ``zope.app.server`` to an `app` extra in ``setup.py``
+  as the tests do not need it and the profiler may be used in a WSGI
+  application then it is not needed, too.
+
+- Declared ``zope.dublincore`` in `app` extra, too, as it is not needed by
+  the tests but `bin/app` requires now version 3.7 to run.
+
+
 0.9.0 (2009-12-26)
 ------------------
 

Modified: z3c.profiler/trunk/buildout.cfg
===================================================================
--- z3c.profiler/trunk/buildout.cfg	2010-08-19 20:15:02 UTC (rev 115810)
+++ z3c.profiler/trunk/buildout.cfg	2010-08-19 20:30:44 UTC (rev 115811)
@@ -29,7 +29,7 @@
 
 [app]
 recipe = z3c.recipe.dev:app
-eggs = z3c.profiler
+eggs = z3c.profiler [app]
        zope.app.zopeappgenerations
 
 server = zserver
@@ -71,6 +71,9 @@
   <!-- load profiler setup -->
   <include package="z3c.profiler" file="setup.zcml" />
 
+  <!-- zope server -->
+  <include package="zope.app.server" />
+  <include package="zope.dublincore" />
 
   <!-- load other zcml files -->
   <include file="securitypolicy.zcml" />
@@ -129,7 +132,7 @@
       role="zope.Anonymous"
       />
   <grant
-      permission="zope.app.dublincore.view"
+      permission="zope.dublincore.view"
       role="zope.Anonymous"
       />
 

Modified: z3c.profiler/trunk/setup.py
===================================================================
--- z3c.profiler/trunk/setup.py	2010-08-19 20:15:02 UTC (rev 115810)
+++ z3c.profiler/trunk/setup.py	2010-08-19 20:30:44 UTC (rev 115811)
@@ -58,11 +58,13 @@
     namespace_packages = ['z3c'],
     extras_require = dict(
         test = [
-            'z3c.coverage',
             'z3c.etestbrowser',
             'zope.app.testing',
-            'zope.app.generations',
             ],
+        app = [
+            'zope.app.server',
+            'zope.dublincore >= 3.7',
+            ]
         ),
     install_requires = [
         'setuptools',
@@ -71,8 +73,7 @@
         'z3c.pagelet',
         'z3c.template',
         'z3c.zrtresource',
-        'zope.app.pagetemplate',
-        'zope.app.server',
+        'zope.app.wsgi',
         'zope.browserpage',
         'zope.component >= 3.8.0',
         'zope.componentvocabulary',
@@ -81,6 +82,7 @@
         'zope.i18n',
         'zope.i18nmessageid',
         'zope.interface',
+        'zope.login',
         'zope.principalregistry',
         'zope.schema',
         'zope.security >= 3.6.0',

Modified: z3c.profiler/trunk/src/z3c/profiler/setup.zcml
===================================================================
--- z3c.profiler/trunk/src/z3c/profiler/setup.zcml	2010-08-19 20:15:02 UTC (rev 115810)
+++ z3c.profiler/trunk/src/z3c/profiler/setup.zcml	2010-08-19 20:30:44 UTC (rev 115811)
@@ -8,14 +8,8 @@
   <!-- Turn on the devmode -->
   <meta:provides feature="devmode" />
 
-  <!-- exclude will prevent from include -->
-  <exclude package="zope.dublincore.browser" />
-  <exclude package="zope.app.generations.browser" />
-
-
   <!-- meta configure -->
   <include package="zope.component" file="meta.zcml" />
-  <include package="zope.app.pagetemplate" file="meta.zcml" />
   <include package="zope.app.publication" file="meta.zcml" />
   <include package="zope.publisher" file="meta.zcml" />
   <include package="zope.i18n" file="meta.zcml" />
@@ -35,18 +29,13 @@
 
   <!-- bootstrap Database -->
   <include package="zope.app.appsetup" />
-  <include package="zope.app.generations" />
 
-  <!-- zope server -->
-  <include package="zope.app.server" />
-
   <!-- zope packages -->
   <include package="zope.password" />
   <include package="zope.annotation" />
   <include package="zope.component" />
   <include package="zope.container" />
   <include package="zope.contentprovider" />
-  <include package="zope.dublincore" />
   <include package="zope.error" />
   <include package="zope.location" />
   <include package="zope.publisher" />
@@ -61,9 +50,9 @@
   <include package="zope.principalregistry" />
   <include package="zope.session" />
   <include package="zope.browserresource" />
+  <include package="zope.login" />
 
   <!-- zope app package configuration -->
-  <include package="zope.app.generations" file="subscriber.zcml" />
   <include package="zope.app.publication" />
 
   <include package="z3c.layer.pagelet" />



More information about the checkins mailing list