From 8c4de64c11c0f6609bf2f85ba40fa9037c49f6ef Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Tue, 11 Nov 2014 13:57:26 +0000 Subject: fix absolute comparison for >= conflict detects --- exts/pip_find_deps.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'exts/pip_find_deps.py') diff --git a/exts/pip_find_deps.py b/exts/pip_find_deps.py index bad31ec..7c2d499 100755 --- a/exts/pip_find_deps.py +++ b/exts/pip_find_deps.py @@ -209,14 +209,16 @@ def check_gt(dep, version, inclusive=False): gt_symbol = '>=' if inclusive else '>' gt = UpperBound(version, inclusive) + # TODO: terrible name def abs_cmp(x, y): return x < y if inclusive else x <= y if dep.is_unconstrained(): dep.greater_than = UpperBound(version, inclusive) elif dep.is_unbounded(): - if dep.absolute <= version: # again unless inclusive + #if dep.absolute <= version: # again unless inclusive #if gt >= dep.absolute: + if abs_cmp(dep.absolute, version): dep.conflicts.append((('==', dep.absolute), (gt_symbol, version))) elif dep.less_than <= version: dep.conflicts.append((dep.less_than.spec, (gt_symbol, version))) -- cgit v1.2.1