Commit 60b7dbd2 authored by Jim Fulton's avatar Jim Fulton

Make sure buildout uses zc.recipe.egg>=2.0.0a3, which mainly matters

for Python 3.
parent 5d1ca5e7
...@@ -13,6 +13,9 @@ Change History ...@@ -13,6 +13,9 @@ Change History
- Versions in versions sections can now be simple constraints, like - Versions in versions sections can now be simple constraints, like
>=2.0dev in addition to being simple versions. >=2.0dev in addition to being simple versions.
Buildout 2 leverages this to make sure it used
zc.recipe.egg>=2.0.0a3, which mainly matters for Python 3.
2.0.0a4 (2012-11-19) 2.0.0a4 (2012-11-19)
==================== ====================
......
...@@ -286,7 +286,7 @@ class Buildout(DictMixin): ...@@ -286,7 +286,7 @@ class Buildout(DictMixin):
self._error('Invalid value for newest option: %s', newest) self._error('Invalid value for newest option: %s', newest)
self.newest = (newest == 'true') self.newest = (newest == 'true')
versions = {} versions = {'zc.recipe.egg': '>=2.0.0a3'}
self.versions = versions self.versions = versions
versions_section = options.get('versions') versions_section = options.get('versions')
if versions_section: if versions_section:
......
...@@ -2578,8 +2578,8 @@ or paths to use: ...@@ -2578,8 +2578,8 @@ or paths to use:
>>> remove('setup.cfg') >>> remove('setup.cfg')
>>> print_(system(buildout + ' -csetup.cfg init demo other ./src'), end='') >>> print_(system(buildout + ' -csetup.cfg init demo other ./src'), end='')
Creating '/sample-bootstrapped/setup.cfg'. Creating '/sample-bootstrapped/setup.cfg'.
Getting distribution for 'zc.recipe.egg'. Getting distribution for 'zc.recipe.egg>=2.0.0a3'.
Got zc.recipe.egg 1.3.3dev. Got zc.recipe.egg
Installing py. Installing py.
Getting distribution for 'demo'. Getting distribution for 'demo'.
Got demo 0.3. Got demo 0.3.
......
...@@ -2695,6 +2695,27 @@ def test_constrained_requirement(): ...@@ -2695,6 +2695,27 @@ def test_constrained_requirement():
... print_('failed', o, c, g, '!=', e) ... print_('failed', o, c, g, '!=', e)
""" """
def want_new_zcrecipeegg():
"""
>>> write('buildout.cfg',
... '''
... [buildout]
... parts = egg
... [egg]
... recipe = zc.recipe.egg <2dev
... eggs = demo
... ''')
>>> print_(system(join('bin', 'buildout')), end='') # doctest: +ELLIPSIS
The constraint, >=2.0.0a3,...
While:
Installing.
Getting section egg.
Initializing section egg.
Installing recipe zc.recipe.egg <2dev.
Error: Bad constraint >=2.0.0a3 zc.recipe.egg<2dev
"""
###################################################################### ######################################################################
def create_sample_eggs(test, executable=sys.executable): def create_sample_eggs(test, executable=sys.executable):
......
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