[Zope-Checkins] SVN: Zope/trunk/ LP #634942: Only require ``nt_svcutils`` on Windows.
Hanno Schlichting
hannosch at hannosch.eu
Sat Sep 25 11:42:36 EDT 2010
Log message for revision 116933:
LP #634942: Only require ``nt_svcutils`` on Windows.
Changed:
U Zope/trunk/buildout.cfg
U Zope/trunk/doc/CHANGES.rst
U Zope/trunk/setup.py
-=-
Modified: Zope/trunk/buildout.cfg
===================================================================
--- Zope/trunk/buildout.cfg 2010-09-25 15:27:10 UTC (rev 116932)
+++ Zope/trunk/buildout.cfg 2010-09-25 15:42:36 UTC (rev 116933)
@@ -63,7 +63,6 @@
Record
RestrictedPython
initgroups
- nt_svcutils
tempstorage
zExceptions
zLOG
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst 2010-09-25 15:27:10 UTC (rev 116932)
+++ Zope/trunk/doc/CHANGES.rst 2010-09-25 15:42:36 UTC (rev 116933)
@@ -14,6 +14,8 @@
- Fixed ``testZODBCompat`` tests in ZopeTestCase to match modern ZODB
semantics.
+- LP #634942: Only require ``nt_svcutils`` on Windows.
+
Features Added
++++++++++++++
Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py 2010-09-25 15:27:10 UTC (rev 116932)
+++ Zope/trunk/setup.py 2010-09-25 15:42:36 UTC (rev 116933)
@@ -13,9 +13,15 @@
##############################################################################
import os
+import sys
from setuptools import setup, find_packages
+additional_install_requires = []
+if sys.platform[:3].lower() == "win":
+ additional_install_requires += ['nt_svcutils']
+
+
setup(name='Zope2',
version='2.13.0a5.dev',
url='http://zope2.zope.org',
@@ -56,7 +62,6 @@
'ZopeUndo',
'docutils',
'initgroups',
- 'nt_svcutils',
'pytz',
'setuptools',
'tempstorage',
@@ -106,7 +111,7 @@
'Products.MIMETools',
'Products.PythonScripts',
'Products.StandardCacheManagers',
- ],
+ ] + additional_install_requires,
include_package_data=True,
zip_safe=False,
More information about the Zope-Checkins
mailing list