[Checkins] SVN: zope.app.appsetup/trunk/ make zope.testing an optional (test) dependency
Roger Ineichen
roger at projekt01.ch
Fri Dec 25 17:50:44 EST 2009
Log message for revision 107070:
make zope.testing an optional (test) dependency
Changed:
U zope.app.appsetup/trunk/CHANGES.txt
U zope.app.appsetup/trunk/setup.py
U zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py
U zope.app.appsetup/trunk/src/zope/app/appsetup/product.py
-=-
Modified: zope.app.appsetup/trunk/CHANGES.txt
===================================================================
--- zope.app.appsetup/trunk/CHANGES.txt 2009-12-25 22:44:38 UTC (rev 107069)
+++ zope.app.appsetup/trunk/CHANGES.txt 2009-12-25 22:50:44 UTC (rev 107070)
@@ -4,7 +4,7 @@
3.13.1 (unreleased)
-------------------
-- Nothing changed yet.
+- make zope.testing an optional (test) dependency
3.13.0 (2009-12-24)
@@ -18,6 +18,7 @@
- Added missing install dependency on `zope.testing`.
+
3.12.0 (2009-06-20)
-------------------
Modified: zope.app.appsetup/trunk/setup.py
===================================================================
--- zope.app.appsetup/trunk/setup.py 2009-12-25 22:44:38 UTC (rev 107069)
+++ zope.app.appsetup/trunk/setup.py 2009-12-25 22:50:44 UTC (rev 107070)
@@ -62,10 +62,14 @@
url='http://pypi.python.org/pypi/zope.app.appsetup',
packages=find_packages('src'),
package_dir={'': 'src'},
- extras_require=dict(test=['zope.app.testing',
- 'zope.componentvocabulary',
- 'zope.principalregistry',
- ]),
+ extras_require=dict(
+ test=[
+ 'zope.app.testing',
+ 'zope.componentvocabulary',
+ 'zope.principalregistry',
+ 'zope.testing',
+ ]
+ ),
namespace_packages=['zope', 'zope.app'],
install_requires=[
'ZODB3',
@@ -81,7 +85,6 @@
'zope.security >= 3.6.0',
'zope.session',
'zope.site',
- 'zope.testing',
'zope.traversing',
],
include_package_data=True,
Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py 2009-12-25 22:44:38 UTC (rev 107069)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py 2009-12-25 22:50:44 UTC (rev 107070)
@@ -243,6 +243,9 @@
global __config_context
__config_context = None
-from zope.testing.cleanup import addCleanUp
-addCleanUp(reset)
-del addCleanUp
+try:
+ import zope.testing.cleanup
+except ImportError:
+ pass
+else:
+ zope.testing.cleanup.addCleanUp(reset)
Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/product.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/product.py 2009-12-25 22:44:38 UTC (rev 107069)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/product.py 2009-12-25 22:50:44 UTC (rev 107070)
@@ -5,12 +5,17 @@
import ZConfig
import os.path
-import zope.testing.cleanup
_configs = {}
_schema = None
-zope.testing.cleanup.addCleanUp(_configs.clear)
+try:
+ import zope.testing.cleanup
+except ImportError:
+ pass
+else:
+ zope.testing.cleanup.addCleanUp(_configs.clear)
+
def getProductConfiguration(name):
More information about the checkins
mailing list