[Checkins] SVN: zope.error/trunk/ Clean up dependencies. Drop all testing dependencies.

[Dan Korostelev]

Log message for revision 98169:
  Clean up dependencies. Drop all testing dependencies.
  Fix ImportError when zope.testing is not available for some reason.
  Remove zcml slug and old zpkg-related files.
  Remove word "version" from changelog entries.
  Fix package's mailing list address and homepage url.
  

Changed:
  U   zope.error/trunk/CHANGES.txt
  U   zope.error/trunk/buildout.cfg
  U   zope.error/trunk/setup.py
  D   zope.error/trunk/src/zope/error/SETUP.cfg
  U   zope.error/trunk/src/zope/error/error.py
  U   zope.error/trunk/src/zope/error/tests.py
  D   zope.error/trunk/src/zope/error/zope.error-configure.zcml

-=-
Modified: zope.error/trunk/CHANGES.txt
===================================================================
--- zope.error/trunk/CHANGES.txt	2009-03-16 22:02:25 UTC (rev 98168)
+++ zope.error/trunk/CHANGES.txt	2009-03-16 22:21:14 UTC (rev 98169)
@@ -2,26 +2,37 @@
 CHANGES
 =======
 
-Version 3.6.1 (unreleased)
---------------------------
+3.6.1 (unreleased)
+------------------
 
-- ...
+- Clean up dependencies. Drop all testing dependencies as we only need
+  zope.testing now.
 
-Version 3.6.0 (2009-01-31)
---------------------------
+- Fix ImportError when zope.testing is not available for some reason.
 
+- Remove zcml slug and old zpkg-related files.
+
+- Remove word "version" from changelog entries.
+
+- Change package's mailing list address to zope-dev at zope.org as
+  zope3-dev at zope.org is now retired. Also change `cheeseshop` to
+  `pypi` in the package's homepage url.
+
+3.6.0 (2009-01-31)
+------------------
+
 - Use zope.container instead of zope.app.container
 
 - Move error log bootstrapping logic (which was untested) to
   ``zope.app.appsetup``, to which we added a test.
 
-Version 3.5.1 (2007-09-27)
---------------------------
+3.5.1 (2007-09-27)
+------------------
 
 - rebumped to replace faulty egg
 
-Version 3.5.0 
--------------
+3.5.0 
+-----
 
 - Initial documented release
 

Modified: zope.error/trunk/buildout.cfg
===================================================================
--- zope.error/trunk/buildout.cfg	2009-03-16 22:02:25 UTC (rev 98168)
+++ zope.error/trunk/buildout.cfg	2009-03-16 22:21:14 UTC (rev 98169)
@@ -1,8 +1,7 @@
 [buildout]
 develop = . 
 parts = test
-find-links = http://download.zope.org/distribution/
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.error [test]
+eggs = zope.error

Modified: zope.error/trunk/setup.py
===================================================================
--- zope.error/trunk/setup.py	2009-03-16 22:02:25 UTC (rev 98168)
+++ zope.error/trunk/setup.py	2009-03-16 22:21:14 UTC (rev 98169)
@@ -26,7 +26,7 @@
 setup(name='zope.error',
     version = '3.6.1dev',
     author='Zope Corporation and Contributors',
-    author_email='zope3-dev at zope.org',
+    author_email='zope-dev at zope.org',
     description = "An error reporting utility for Zope3",
     long_description=(
         read('README.txt')
@@ -45,16 +45,15 @@
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
         'Framework :: Zope3'],
-    url='http://cheeseshop.python.org/pypi/zope.error',
+    url='http://pypi.python.org/pypi/zope.error',
 	packages=find_packages('src'),
 	package_dir = {'': 'src'},
-    extras_require=dict(
-        test=['zope.app.testing']),
     namespace_packages=['zope',],
     install_requires=['setuptools',
+                      'zope.container',
                       'zope.exceptions',
+                      'zope.interface',
                       'zope.publisher',
-                      'zope.container',
                       ],
     include_package_data = True,
 

Deleted: zope.error/trunk/src/zope/error/SETUP.cfg
===================================================================
--- zope.error/trunk/src/zope/error/SETUP.cfg	2009-03-16 22:02:25 UTC (rev 98168)
+++ zope.error/trunk/src/zope/error/SETUP.cfg	2009-03-16 22:21:14 UTC (rev 98169)
@@ -1,5 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files zopeskel/etc/package-includes>
-  zope.error-*.zcml
-</data-files>

Modified: zope.error/trunk/src/zope/error/error.py
===================================================================
--- zope.error/trunk/src/zope/error/error.py	2009-03-16 22:02:25 UTC (rev 98168)
+++ zope.error/trunk/src/zope/error/error.py	2009-03-16 22:21:14 UTC (rev 98169)
@@ -281,6 +281,9 @@
 _clear = _cleanup_temp_log
 
 # Register our cleanup with Testing.CleanUp to make writing unit tests simpler.
-from zope.testing.cleanup import addCleanUp
-addCleanUp(_clear)
-del addCleanUp
+try:
+    from zope.testing.cleanup import addCleanUp
+    addCleanUp(_clear)
+    del addCleanUp
+except ImportError:
+    pass

Modified: zope.error/trunk/src/zope/error/tests.py
===================================================================
--- zope.error/trunk/src/zope/error/tests.py	2009-03-16 22:02:25 UTC (rev 98168)
+++ zope.error/trunk/src/zope/error/tests.py	2009-03-16 22:21:14 UTC (rev 98169)
@@ -20,7 +20,7 @@
 
 from zope.exceptions.exceptionformatter import format_exception
 from zope.publisher.tests.httprequest import TestRequest
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.testing import cleanup
 
 from zope.error.error import ErrorReportingUtility, getFormattedException
 
@@ -38,7 +38,7 @@
     except:
         return sys.exc_info()
 
-class ErrorReportingUtilityTests(PlacelessSetup, unittest.TestCase):
+class ErrorReportingUtilityTests(cleanup.CleanUp, unittest.TestCase):
 
     def test_checkForEmptyLog(self):
         # Test Check Empty Log

Deleted: zope.error/trunk/src/zope/error/zope.error-configure.zcml
===================================================================
--- zope.error/trunk/src/zope/error/zope.error-configure.zcml	2009-03-16 22:02:25 UTC (rev 98168)
+++ zope.error/trunk/src/zope/error/zope.error-configure.zcml	2009-03-16 22:21:14 UTC (rev 98169)
@@ -1 +0,0 @@
-<include package="zope.error"/>