[Checkins] SVN: zope.configuration/branches/tseaver-test_cleanup/ Drop hard testing dependency on ``zope.testing``.

Tres Seaver cvs-admin at zope.org
Wed May 9 05:51:07 UTC 2012


Log message for revision 125754:
  Drop hard testing dependency on ``zope.testing``.
  

Changed:
  U   zope.configuration/branches/tseaver-test_cleanup/CHANGES.txt
  U   zope.configuration/branches/tseaver-test_cleanup/setup.py
  U   zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py

-=-
Modified: zope.configuration/branches/tseaver-test_cleanup/CHANGES.txt
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/CHANGES.txt	2012-05-09 05:51:00 UTC (rev 125753)
+++ zope.configuration/branches/tseaver-test_cleanup/CHANGES.txt	2012-05-09 05:51:04 UTC (rev 125754)
@@ -5,6 +5,8 @@
 4.0.0 (unreleased)
 ------------------
 
+- Dropped hard testing dependency on ``zope.testing``.
+
 - Added explicit support for PyPy.
 
 - Added explicit support for Python 3.2.

Modified: zope.configuration/branches/tseaver-test_cleanup/setup.py
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/setup.py	2012-05-09 05:51:00 UTC (rev 125753)
+++ zope.configuration/branches/tseaver-test_cleanup/setup.py	2012-05-09 05:51:04 UTC (rev 125754)
@@ -56,7 +56,7 @@
                     suite.addTest(mod.test_suite())
     return suite
 
-TESTS_REQUIRE = ['zope.testing']
+TESTS_REQUIRE = []
 
 setup(name='zope.configuration',
       version = '4.0.0dev',
@@ -92,7 +92,7 @@
       namespace_packages=['zope'],
       extras_require={
         'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
-        'test': TESTS_REQUIRE,
+        'test': ['zope.testing'],
         'testing': TESTS_REQUIRE + ['nose', 'coverage'],
       },
       install_requires=['zope.i18nmessageid',
@@ -102,6 +102,6 @@
                        ],
       include_package_data=True,
       zip_safe=False,
-      tests_require = 'zope.testing',
+      tests_require = TESTS_REQUIRE,
       test_suite='__main__.alltests',
       )

Modified: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py	2012-05-09 05:51:00 UTC (rev 125753)
+++ zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/tests/test_xmlconfig.py	2012-05-09 05:51:04 UTC (rev 125754)
@@ -310,12 +310,12 @@
 class XMLConfigTests(unittest.TestCase):
 
     def setUp(self):
-        from zope.testing.cleanup import CleanUp
-        CleanUp().cleanUp()
+        from zope.configuration.xmlconfig import _clearContext
+        _clearContext()
 
     def tearDown(self):
-        from zope.testing.cleanup import CleanUp
-        CleanUp().cleanUp()
+        from zope.configuration.xmlconfig import _clearContext
+        _clearContext()
 
     def _getTargetClass(self):
         from zope.configuration.xmlconfig import XMLConfig



More information about the checkins mailing list