Commit f3e4212f authored by Hanno Schlichting's avatar Hanno Schlichting

Removed the `getPackages` wrapper from setup.py which would force all versions...

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.
parent 925d4ae7
...@@ -25,6 +25,11 @@ Restructuring ...@@ -25,6 +25,11 @@ Restructuring
- Updated to ZODB 3.9.0a12. - 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) 2.12.0a1 (2009-02-26)
--------------------- ---------------------
......
...@@ -18,20 +18,6 @@ from setuptools import setup, find_packages, Extension ...@@ -18,20 +18,6 @@ from setuptools import setup, find_packages, Extension
EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src'] 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', setup(name='Zope2',
version = '2.12.0.a1', version = '2.12.0.a1',
url='http://www.zope.org', url='http://www.zope.org',
...@@ -113,7 +99,7 @@ setup(name='Zope2', ...@@ -113,7 +99,7 @@ setup(name='Zope2',
], ],
install_requires=getPackages([ install_requires=[
'Acquisition', 'Acquisition',
'DateTime', 'DateTime',
'docutils', 'docutils',
...@@ -166,10 +152,10 @@ setup(name='Zope2', ...@@ -166,10 +152,10 @@ setup(name='Zope2',
'zope.app.publisher', 'zope.app.publisher',
'zope.app.schema', 'zope.app.schema',
'zope.app.testing', 'zope.app.testing',
]), ],
extras_require = dict( extras_require = dict(
zope_app = getPackages([ zope_app = [
'zope.annotation', 'zope.annotation',
'zope.cachedescriptors', 'zope.cachedescriptors',
'zope.copypastemove', 'zope.copypastemove',
...@@ -235,7 +221,7 @@ setup(name='Zope2', ...@@ -235,7 +221,7 @@ setup(name='Zope2',
'zope.app.zcmlfiles', 'zope.app.zcmlfiles',
'zope.app.zopeappgenerations', 'zope.app.zopeappgenerations',
'zope.app.zptpage', 'zope.app.zptpage',
]), ],
), ),
include_package_data=True, include_package_data=True,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment