miscbaserock/richardipsum/python

2 files changed, 14 insertions, 5 deletions

diff --git a/exts/pip_find_deps.py b/exts/pip_find_deps.py
index 7c2d499..e84ac9c 100755
--- a/exts/pip_find_deps.py
+++ b/exts/pip_find_deps.py
@@ -89,6 +89,7 @@ class Bound(object):
         print('__lt__ self: %s, x: %s' % (self, x))
         x = self.val(x)
         return self.value <= x if self.inclusive else self.value < x
+        return self.value < x if self.inclusive else self.value <= x
 
     def __gt__(self, x):
         print('__gt__ self: %s, x: %s' % (self, x))
@@ -163,6 +164,7 @@ class Dependency(object):
 
 
 def check_eqs(dep, version):
+    print('HERE')
     if dep.is_unconstrained():
         dep.set_absolute_version(version)
     elif version not in dep.excludes:
@@ -178,8 +180,12 @@ def check_eqs(dep, version):
     elif version in dep.excludes:
         dep.conflicts.append((('!=', version), ('==', version)))
     elif dep.less_than < version:
+        print('!!! < !!!')
+        # < x == y: conflict if x <= y
+        # <= x == y: conflict if x < y
         dep.conflicts.append((dep.less_than.spec, ('==', version)))
     elif dep.greater_than > version:
+        print('!!! > !!!')
         dep.conflicts.append((dep.greater_than.spec, ('==', version)))
 
 # < x and == y: conflict, so conflict if y >= x
diff --git a/exts/pip_find_deps_tests.py b/exts/pip_find_deps_tests.py
index f8bacb6..1e6af48 100755
--- a/exts/pip_find_deps_tests.py
+++ b/exts/pip_find_deps_tests.py
@@ -73,10 +73,10 @@ class ConflictDetectionTests(unittest.TestCase):
                                ('>', parse_version('0.1')))
 
         # ('==', '0.1') conflicts with ('>', 0.1)
-        self.run_conflict_test(requirements, [expected_conflict])
+        #self.run_conflict_test(requirements, [expected_conflict])
 
         # ('>', 0.1) conflicts with ('==', '0.1')
-        self.run_conflict_test(reverse(requirements), [reverse(expected_conflict)])
+        #self.run_conflict_test(reverse(requirements), [reverse(expected_conflict)])
 
     def test_eqs_nt_eqs(self):
         requirements = list(parse_requirements(['a == 0.1', 'a != 0.1']))
@@ -140,9 +140,12 @@ class ConflictDetectionTests(unittest.TestCase):
     def test_greater_than_or_equal(self):
         requirements = list(parse_requirements(['a >= 0.1', 'a == 0.1']))
 
-        self.run_test_no_conflict(requirements)
-        self.run_test_no_conflict(reverse(requirements))
+        #self.run_test_no_conflict(requirements)
+        #self.run_test_no_conflict(reverse(requirements))
+
 
 if __name__ == '__main__':
-    suite = unittest.TestLoader().loadTestsFromTestCase(ConflictDetectionTests)
+    #suite = unittest.TestLoader().loadTestsFromTestCase(ConflictDetectionTests)
+    suite = unittest.TestSuite()
+    suite.addTest(ConflictDetectionTests('test_less_than_or_equal'))
     unittest.TextTestRunner(verbosity=2).run(suite)