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
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
c4628986
Commit
c4628986
authored
Jan 17, 2013
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: spaces in version constriants (e.g. ``< 2``) weren't handled
correctly.
parent
d212d82d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
CHANGES.rst
CHANGES.rst
+3
-0
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+1
-1
src/zc/buildout/tests.py
src/zc/buildout/tests.py
+3
-0
No files found.
CHANGES.rst
View file @
c4628986
...
@@ -18,6 +18,9 @@ Fixed: initialization code wasn't included in interpeter scripts.
...
@@ -18,6 +18,9 @@ Fixed: initialization code wasn't included in interpeter scripts.
Fixed: macro inheritance bug, https://github.com/buildout/buildout/pull/37
Fixed: macro inheritance bug, https://github.com/buildout/buildout/pull/37
Fixed: spaces in version constriants (e.g. ``< 2``) weren't handled
correctly.
2.0.0a7 (2013-01-12)
2.0.0a7 (2013-01-12)
====================
====================
...
...
src/zc/buildout/easy_install.py
View file @
c4628986
...
@@ -1299,7 +1299,7 @@ def bad_constraint(constraint, requirement):
...
@@ -1299,7 +1299,7 @@ def bad_constraint(constraint, requirement):
"requirement, %r."
,
constraint
,
str
(
requirement
))
"requirement, %r."
,
constraint
,
str
(
requirement
))
raise
IncompatibleConstraintError
(
"Bad constraint"
,
constraint
,
requirement
)
raise
IncompatibleConstraintError
(
"Bad constraint"
,
constraint
,
requirement
)
_parse_constraint
=
re
.
compile
(
r'([<>]=?)(\
S+)
').match
_parse_constraint
=
re
.
compile
(
r'([<>]=?)
\
s*
(
\S+)'
).
match
_comparef
=
{
_comparef
=
{
'>'
:
lambda
x
,
y
:
x
>
y
,
'>'
:
lambda
x
,
y
:
x
>
y
,
'>='
:
lambda
x
,
y
:
x
>=
y
,
'>='
:
lambda
x
,
y
:
x
>=
y
,
...
...
src/zc/buildout/tests.py
View file @
c4628986
...
@@ -2666,6 +2666,7 @@ def test_constrained_requirement():
...
@@ -2666,6 +2666,7 @@ def test_constrained_requirement():
... ('x>1', '2', 'x==2'),
... ('x>1', '2', 'x==2'),
... ('x>3', '2', IncompatibleConstraintError),
... ('x>3', '2', IncompatibleConstraintError),
... ('x>1', '>2', 'x>2'),
... ('x>1', '>2', 'x>2'),
... ('x>1', '> 2', 'x>2'),
... ('x>1', '>=2', 'x>=2'),
... ('x>1', '>=2', 'x>=2'),
... ('x<1', '>2', IncompatibleConstraintError),
... ('x<1', '>2', IncompatibleConstraintError),
... ('x<=1', '>=1', 'x>=1,<1,==1'),
... ('x<=1', '>=1', 'x>=1,<1,==1'),
...
@@ -2677,7 +2678,9 @@ def test_constrained_requirement():
...
@@ -2677,7 +2678,9 @@ def test_constrained_requirement():
... ('x<3', '2', 'x==2'),
... ('x<3', '2', 'x==2'),
... ('x<1', '2', IncompatibleConstraintError),
... ('x<1', '2', IncompatibleConstraintError),
... ('x<3', '<2', 'x<2'),
... ('x<3', '<2', 'x<2'),
... ('x<3', '< 2', 'x<2'),
... ('x<3', '<=2', 'x<=2'),
... ('x<3', '<=2', 'x<=2'),
... ('x<3', '<= 2', 'x<=2'),
... ('x>3', '<2', IncompatibleConstraintError),
... ('x>3', '<2', IncompatibleConstraintError),
... ('x>=1', '<=1', 'x<=1,>1,==1'),
... ('x>=1', '<=1', 'x<=1,>1,==1'),
... ('x<3', '>1', 'x>1,<3'),
... ('x<3', '>1', 'x>1,<3'),
...
...
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