Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos.buildout
Commits
04314df7
Commit
04314df7
authored
Dec 30, 2012
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set default version requirements to prevent updating zc.recipe.egg and
zc.recipe.testrunner past version 1
parent
fc779f59
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
11 deletions
+15
-11
CHANGES.txt
CHANGES.txt
+6
-3
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+8
-7
src/zc/buildout/buildout.txt
src/zc/buildout/buildout.txt
+1
-1
No files found.
CHANGES.txt
View file @
04314df7
...
@@ -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
...
...
src/zc/buildout/buildout.py
View file @
04314df7
...
@@ -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
:
...
...
src/zc/buildout/buildout.txt
View file @
04314df7
...
@@ -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'.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment