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
Thomas Leymonerie
slapos.buildout
Commits
60b7dbd2
Commit
60b7dbd2
authored
Nov 30, 2012
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure buildout uses zc.recipe.egg>=2.0.0a3, which mainly matters
for Python 3.
parent
5d1ca5e7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
6 deletions
+30
-6
CHANGES.rst
CHANGES.rst
+3
-0
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+1
-1
src/zc/buildout/buildout.txt
src/zc/buildout/buildout.txt
+2
-2
src/zc/buildout/tests.py
src/zc/buildout/tests.py
+24
-3
No files found.
CHANGES.rst
View file @
60b7dbd2
...
...
@@ -13,6 +13,9 @@ Change History
- Versions in versions sections can now be simple constraints, like
>=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)
====================
...
...
src/zc/buildout/buildout.py
View file @
60b7dbd2
...
...
@@ -286,7 +286,7 @@ class Buildout(DictMixin):
self
.
_error
(
'Invalid value for newest option: %s'
,
newest
)
self
.
newest
=
(
newest
==
'true'
)
versions
=
{}
versions
=
{
'zc.recipe.egg'
:
'>=2.0.0a3'
}
self
.
versions
=
versions
versions_section
=
options
.
get
(
'versions'
)
if
versions_section
:
...
...
src/zc/buildout/buildout.txt
View file @
60b7dbd2
...
...
@@ -2578,8 +2578,8 @@ or paths to use:
>>> remove('setup.cfg')
>>> print_(system(buildout + ' -csetup.cfg init demo other ./src'), end='')
Creating '/sample-bootstrapped/setup.cfg'.
Getting distribution for 'zc.recipe.egg'.
Got zc.recipe.egg
1.3.3dev.
Getting distribution for 'zc.recipe.egg
>=2.0.0a3
'.
Got zc.recipe.egg
Installing py.
Getting distribution for 'demo'.
Got demo 0.3.
...
...
src/zc/buildout/tests.py
View file @
60b7dbd2
...
...
@@ -2669,8 +2669,8 @@ def test_constrained_requirement():
... ('x<3', '>1', 'x>1,<3'),
... ('x==2', '>1', 'x==2'),
... ('x==2', '>=2', 'x==2'),
... ('x[y]',
'1', 'x[y]==1'),
... ('x[y]>1',
'2', 'x[y]==2'),
... ('x[y]', '1', 'x[y]==1'),
... ('x[y]>1', '2', 'x[y]==2'),
... ('x<3', '2', 'x==2'),
... ('x<1', '2', IncompatibleConstraintError),
... ('x<3', '<2', 'x<2'),
...
...
@@ -2680,7 +2680,7 @@ def test_constrained_requirement():
... ('x<3', '>1', 'x>1,<3'),
... ('x==2', '<3', 'x==2'),
... ('x==2', '<=2', 'x==2'),
... ('x[y]<3', '2',
'x[y]==2'),
... ('x[y]<3', '2', 'x[y]==2'),
... ]
>>> from zc.buildout.easy_install import _constrained_requirement
>>> for o, c, e in examples:
...
...
@@ -2695,6 +2695,27 @@ def test_constrained_requirement():
... 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
):
...
...
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