Fix union of adjacent ranges with upper_inc=True

* Closes #11
* Includes a test case
* Changelog updated, version bumped

doc/changelog.rst

@@ -5,6 +5,15 @@ first `0.1` release does not properly adhere to this. Unless explicitly stated,
 changes are made by `Andreas Runfalk <https://github.com/runfalk>`_.
 
 
+Version 1.0.2
+-------------
+Released on 20th July, 2018
+
+ - Fixed :meth:`~spans.types.Range.union` when ``upper_inc`` is set to ``True``
+   (`bug #11 <https://github.com/runfalk/spans/issues/11>`_,
+   `Michael Krahe <https://github.com/der-michik>`_)
+
+
 Version 1.0.1
 -------------
 Released on 31st January, 2018

spans/__init__.py

@@ -12,7 +12,7 @@
 """
 
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 
 __all__ = [

spans/types.py

@@ -484,7 +484,8 @@ def union(self, other):
         else:
             a, b = other, self
 
-        if a.upper <= b.lower and not a.adjacent(b):
+        if (a.upper < b.lower or a.upper == b.lower and not
+                a.upper_inc and not b.lower_inc) and not a.adjacent(b):
             raise ValueError("Ranges must be either adjacent or overlapping")
 
         # a.lower is guaranteed to be the lower bound, but either a.upper or

tests/test_range.py

@@ -545,3 +545,13 @@ def test_bug10_missing_slots_in_cls_hierarchy(cls):
         if c is object:
             continue
         assert hasattr(c, "__slots__")
+
+def test_bug11_valid_union_call_detected_as_invalid():
+    """
+    `Bug #11 <https://github.com/runfalk/spans/issues/11>`_
+    """
+    start, middle, end = 0.0, 1.0, 2.0
+    a = floatrange(start, middle, upper_inc=True)
+    b = floatrange(middle, end)
+
+    assert a.union(b) == floatrange(start, end)