Commit 04314df7 authored by Jim Fulton's avatar Jim Fulton

Set default version requirements to prevent updating zc.recipe.egg and

zc.recipe.testrunner past version 1
parent fc779f59
...@@ -4,15 +4,18 @@ Change History ...@@ -4,15 +4,18 @@ Change History
1.7.0 (unreleased) 1.7.0 (unreleased)
================== ==================
- Unless version requirements are specified, buildout won't upgrade
itself past version 1.
- 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.
This is used to prevent upgrading zc.recipe.egg and
zc.recipe.testrunner past version 1.
- If buildout is bootstrapped with a non-final release, it - If buildout is bootstrapped with a non-final release, it
won't downgrade itself to a final release. won't downgrade itself to a final release.
- Unless version requirements are specified, buildout won't upgrade
itself past version 1.
- Fix: distribute 0.6.33 broke Python 2.4 compatibility - Fix: distribute 0.6.33 broke Python 2.4 compatibility
- remove `data_files` from `setup.py`, which was installing README.txt - remove `data_files` from `setup.py`, which was installing README.txt
......
...@@ -275,13 +275,14 @@ class Buildout(UserDict.DictMixin): ...@@ -275,13 +275,14 @@ class Buildout(UserDict.DictMixin):
self._setup_logging() self._setup_logging()
versions = options.get('versions') self.versions = {
if versions: 'zc.recipe.egg': '<2',
versions = dict(self[versions]) 'zc.recipe.testrunner': '<2',
zc.buildout.easy_install.default_versions(versions) }
else: versions_option = options.get('versions')
versions = {} if versions_option:
self.versions = versions self.versions.update(self[versions_option])
zc.buildout.easy_install.default_versions(self.versions)
self.offline = options.get_bool('offline') self.offline = options.get_bool('offline')
if self.offline: if self.offline:
......
...@@ -2584,7 +2584,7 @@ or paths to use: ...@@ -2584,7 +2584,7 @@ or paths to use:
>>> print system(buildout + ' -csetup.cfg init demo other ./src'), >>> print system(buildout + ' -csetup.cfg init demo other ./src'),
Creating '/sample-bootstrapped/setup.cfg'. Creating '/sample-bootstrapped/setup.cfg'.
Generated script '/sample-bootstrapped/bin/buildout'. Generated script '/sample-bootstrapped/bin/buildout'.
Getting distribution for 'zc.recipe.egg'. Getting distribution for 'zc.recipe.egg<2'.
Got zc.recipe.egg 1.3.3dev. Got zc.recipe.egg 1.3.3dev.
Installing py. Installing py.
Getting distribution for 'demo'. Getting distribution for 'demo'.
......
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