[Checkins] SVN: z3c.macroviewlet/trunk/ - Fixed tests to run with current package versions

[Michael Howitz]

Log message for revision 114361:
  - Fixed tests to run with current package versions
    (``metaconfigure.registerType`` moved from ``zope.app.pagetemplate``
    to ``zope.browserpage``). Thus requiring ``zope.browserpage`` now.
  
  - No longer use depreacted ``zope.testing.doctest`` and
    ``zope.testing.doctestunit``.
  
  - Removed ZPKG and ZCML slugs.
  

Changed:
  U   z3c.macroviewlet/trunk/CHANGES.txt
  U   z3c.macroviewlet/trunk/setup.py
  D   z3c.macroviewlet/trunk/src/z3c/macroviewlet/SETUP.cfg
  U   z3c.macroviewlet/trunk/src/z3c/macroviewlet/tests.py
  D   z3c.macroviewlet/trunk/src/z3c/macroviewlet/z3c.macroviewlet-configure.zcml
  D   z3c.macroviewlet/trunk/src/z3c/macroviewlet/z3c.macroviewlet-meta.zcml

-=-
Modified: z3c.macroviewlet/trunk/CHANGES.txt
===================================================================
--- z3c.macroviewlet/trunk/CHANGES.txt	2010-07-09 06:38:35 UTC (rev 114360)
+++ z3c.macroviewlet/trunk/CHANGES.txt	2010-07-09 06:50:23 UTC (rev 114361)
@@ -1,12 +1,24 @@
 =======
-CHANGES
+Changes
 =======
-Version 1.0.1dev (unreleased)
--------------------------
 
-- fixed RST formatting in README
+1.0.1dev (unreleased)
+---------------------
 
-Version 1.0.0 (9/21/2007)
--------------------------
+- Fixed tests to run with current package versions
+  (``metaconfigure.registerType`` moved from ``zope.app.pagetemplate``
+  to ``zope.browserpage``). Thus requiring ``zope.browserpage`` now.
 
+- No longer use depreacted ``zope.testing.doctest`` and
+  ``zope.testing.doctestunit``.
+
+- Removed ZPKG and ZCML slugs.
+
+- Fixed RST formatting in README.
+
+
+
+1.0.0 (2007-09-21)
+------------------
+
 - Initial Release

Modified: z3c.macroviewlet/trunk/setup.py
===================================================================
--- z3c.macroviewlet/trunk/setup.py	2010-07-09 06:38:35 UTC (rev 114360)
+++ z3c.macroviewlet/trunk/setup.py	2010-07-09 06:50:23 UTC (rev 114361)
@@ -30,9 +30,7 @@
     long_description=(
         read('README.txt')
         + '\n' +
-        'Detailed Documentation\n'
-        '**********************\n'
-        + '\n\n' +
+        '.. contents::\n\n' +
         read('src', 'z3c', 'macroviewlet', 'README.txt')
         + '\n\n' +
         read('CHANGES.txt')
@@ -65,7 +63,7 @@
     install_requires = [
         'setuptools',
         'zope.app.component',
-        'zope.app.pagetemplate',
+        'zope.browserpage',
         'zope.app.publisher',
         'zope.app.testing',
         'zope.component',

Deleted: z3c.macroviewlet/trunk/src/z3c/macroviewlet/SETUP.cfg
===================================================================
--- z3c.macroviewlet/trunk/src/z3c/macroviewlet/SETUP.cfg	2010-07-09 06:38:35 UTC (rev 114360)
+++ z3c.macroviewlet/trunk/src/z3c/macroviewlet/SETUP.cfg	2010-07-09 06:50:23 UTC (rev 114361)
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
-  z3c.macroviewlet-*.zcml
-</data-files>

Modified: z3c.macroviewlet/trunk/src/z3c/macroviewlet/tests.py
===================================================================
--- z3c.macroviewlet/trunk/src/z3c/macroviewlet/tests.py	2010-07-09 06:38:35 UTC (rev 114360)
+++ z3c.macroviewlet/trunk/src/z3c/macroviewlet/tests.py	2010-07-09 06:50:23 UTC (rev 114361)
@@ -19,8 +19,7 @@
 import os.path
 import unittest
 import zope.security
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
+import doctest
 from zope.app.testing import setup
 from z3c.testing import setUpContentMetaDirectives
 
@@ -35,7 +34,7 @@
     setUpContentMetaDirectives()
 
     # register provider TALES
-    from zope.app.pagetemplate import metaconfigure
+    from zope.browserpage import metaconfigure
     from zope.contentprovider import tales
     metaconfigure.registerType('provider', tales.TALESProviderExpression)
 
@@ -48,11 +47,7 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocFileSuite('README.txt',
+        doctest.DocFileSuite('README.txt',
             setUp=setUp, tearDown=tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
         ))
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

Deleted: z3c.macroviewlet/trunk/src/z3c/macroviewlet/z3c.macroviewlet-configure.zcml
===================================================================
--- z3c.macroviewlet/trunk/src/z3c/macroviewlet/z3c.macroviewlet-configure.zcml	2010-07-09 06:38:35 UTC (rev 114360)
+++ z3c.macroviewlet/trunk/src/z3c/macroviewlet/z3c.macroviewlet-configure.zcml	2010-07-09 06:50:23 UTC (rev 114361)
@@ -1,6 +0,0 @@
-<configure
-    xmlns:zcml="http://namespaces.zope.org/zcml">
-
-  <include package="z3c.macroviewlet" />
-
-</configure>

Deleted: z3c.macroviewlet/trunk/src/z3c/macroviewlet/z3c.macroviewlet-meta.zcml
===================================================================
--- z3c.macroviewlet/trunk/src/z3c/macroviewlet/z3c.macroviewlet-meta.zcml	2010-07-09 06:38:35 UTC (rev 114360)
+++ z3c.macroviewlet/trunk/src/z3c/macroviewlet/z3c.macroviewlet-meta.zcml	2010-07-09 06:50:23 UTC (rev 114361)
@@ -1,6 +0,0 @@
-<configure
-    xmlns:zcml="http://namespaces.zope.org/zcml">
-
-  <include package="z3c.macroviewlet" file="meta.zcml" />
-
-</configure>