[Zope-Checkins] SVN: Zope/trunk/ Removed the `getPackages` wrapper from setup.py which would force all versions to an exact requirement. This made it impossible to require newer versions of the dependencies. This kind of KGS information needs to be expressed in a different way.

[Hanno Schlichting]

Log message for revision 97330:
  Removed the `getPackages` wrapper from setup.py which would force all versions to an exact requirement. This made it impossible to require newer versions of the dependencies. This kind of KGS information needs to be expressed in a different way.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/setup.py

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2009-02-26 19:57:45 UTC (rev 97329)
+++ Zope/trunk/doc/CHANGES.rst	2009-02-26 20:01:31 UTC (rev 97330)
@@ -25,7 +25,12 @@
 
 - Updated to ZODB 3.9.0a12.
 
+- Removed the `getPackages` wrapper from setup.py which would force all
+  versions to an exact requirement. This made it impossible to require
+  newer versions of the dependencies. This kind of KGS information needs
+  to be expressed in a different way.
 
+
 2.12.0a1 (2009-02-26)
 ---------------------
 

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2009-02-26 19:57:45 UTC (rev 97329)
+++ Zope/trunk/setup.py	2009-02-26 20:01:31 UTC (rev 97330)
@@ -18,20 +18,6 @@
 
 EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src']
 
-from util import getVersionForPackage
-def getPackages(packages):
-    """ Return a list of egg names together with their
-        version specs according to the version-zopeX.cfg
-        files.
-    """
-    result = list()
-    for package in packages:
-        if ' ' in package:
-            package = package[:package.find(' ')]
-        version = getVersionForPackage(package)
-        result.append('%s==%s' % (package, version))
-    return result
-
 setup(name='Zope2',
       version = '2.12.0.a1',
       url='http://www.zope.org',
@@ -113,7 +99,7 @@
 
       ],
 
-      install_requires=getPackages([
+      install_requires=[
         'Acquisition',
         'DateTime',
         'docutils',
@@ -166,10 +152,10 @@
         'zope.app.publisher',
         'zope.app.schema',
         'zope.app.testing',
-      ]),
+      ],
 
       extras_require = dict(
-        zope_app = getPackages([
+        zope_app = [
           'zope.annotation',
           'zope.cachedescriptors',
           'zope.copypastemove',
@@ -235,7 +221,7 @@
           'zope.app.zcmlfiles',
           'zope.app.zopeappgenerations',
           'zope.app.zptpage',
-          ]),
+          ],
       ),
 
       include_package_data=True,