[Checkins] SVN: z3c.pdftemplate/trunk/ - Added missing install dependencies and test dependencies.

[Michael Howitz]

Log message for revision 115614:
  - Added missing install dependencies and test dependencies.
  
  - Fixed tests to run with current package versions.
  
  

Changed:
  U   z3c.pdftemplate/trunk/CHANGES.txt
  U   z3c.pdftemplate/trunk/setup.py
  U   z3c.pdftemplate/trunk/src/z3c/pdftemplate/README.txt
  U   z3c.pdftemplate/trunk/src/z3c/pdftemplate/tests.py

-=-
Modified: z3c.pdftemplate/trunk/CHANGES.txt
===================================================================
--- z3c.pdftemplate/trunk/CHANGES.txt	2010-08-10 06:36:10 UTC (rev 115613)
+++ z3c.pdftemplate/trunk/CHANGES.txt	2010-08-10 06:55:13 UTC (rev 115614)
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+0.2.0 (unreleased)
+------------------
+
+- Added missing install dependencies and test dependencies.
+
+- Fixed tests to run with current package versions.
+
+
+
 0.1.0 (2008-02-15)
 ------------------
 

Modified: z3c.pdftemplate/trunk/setup.py
===================================================================
--- z3c.pdftemplate/trunk/setup.py	2010-08-10 06:36:10 UTC (rev 115613)
+++ z3c.pdftemplate/trunk/setup.py	2010-08-10 06:55:13 UTC (rev 115614)
@@ -57,15 +57,21 @@
     extras_require = dict(
         test = [
             'zope.app.testing',
+            'zope.principalannotation',
+            'zope.copypastemove',
+            'zope.app.container',
+            'zope.app.folder',
             ],
         ),
     install_requires = [
         'setuptools',
         'z3c.rml',
+        'zope.app.pagetemplate',
+        'zope.app.publisher',
+        'zope.component',
         'zope.interface',
-        'zope.component',
+        'zope.publisher',
         'zope.schema',
-        'zope.publisher',
         ],
     zip_safe = False,
 )

Modified: z3c.pdftemplate/trunk/src/z3c/pdftemplate/README.txt
===================================================================
--- z3c.pdftemplate/trunk/src/z3c/pdftemplate/README.txt	2010-08-10 06:36:10 UTC (rev 115613)
+++ z3c.pdftemplate/trunk/src/z3c/pdftemplate/README.txt	2010-08-10 06:55:13 UTC (rev 115614)
@@ -13,7 +13,7 @@
 
 But first we have to load the directives' meta configuration:
 
-  >>> from zope.app import zapi
+  >>> import zope.component
   >>> from zope.publisher.browser import TestRequest
   >>> from zope.configuration import xmlconfig
   >>> context = xmlconfig.file('meta.zcml', package=z3c.pdftemplate)
@@ -122,8 +122,8 @@
   >>> request = TestRequest()
   >>> request.setPrincipal(Principal())
 
-  >>> contents = zapi.getMultiAdapter((folder, request),
-  ...                                 name="rmlsample.pdf")
+  >>> contents = zope.component.getMultiAdapter((folder, request),
+  ...                                           name="rmlsample.pdf")
 
 and create the PDF:
 

Modified: z3c.pdftemplate/trunk/src/z3c/pdftemplate/tests.py
===================================================================
--- z3c.pdftemplate/trunk/src/z3c/pdftemplate/tests.py	2010-08-10 06:36:10 UTC (rev 115613)
+++ z3c.pdftemplate/trunk/src/z3c/pdftemplate/tests.py	2010-08-10 06:55:13 UTC (rev 115614)
@@ -17,24 +17,25 @@
 $Id$
 """
 __docformat__ = "reStructuredText"
+
+from zope.app.testing import placelesssetup, setup, ztapi
+from zope.copypastemove import PrincipalClipboard
+from zope.testing import doctest, doctestunit
 import unittest
 import zope.component
+import zope.principalannotation.interfaces
+import zope.principalannotation.utility
 
-from zope.testing import doctest, doctestunit
-from zope.app import principalannotation
-from zope.copypastemove import PrincipalClipboard
-from zope.app.testing import placelesssetup, setup, ztapi
 
-
 def setUp(test):
     placelesssetup.setUp(test)
     setup.setUpTraversal()
 
     zope.component.provideUtility(
-        principalannotation.PrincipalAnnotationUtility(),
-        principalannotation.IPrincipalAnnotationUtility)
+        zope.principalannotation.utility.PrincipalAnnotationUtility(),
+        zope.principalannotation.interfaces.IPrincipalAnnotationUtility)
     zope.component.provideAdapter(
-        principalannotation.annotations,
+        zope.principalannotation.utility.annotations,
         adapts=(None,))
     zope.component.provideAdapter(
         PrincipalClipboard)