Dependency python-intervals was renamed to portion. (IBM#9)

Author: hirzel

jsonsubschema/_checkers.py

@@ -8,7 +8,7 @@
 import math
 import sys
 
-import intervals as I
+import portion as I
 from greenery.lego import parse
 
 import jsonsubschema.config as config
@@ -434,7 +434,7 @@ def __init__(self, s):
         self.multipleOf = self.get("multipleOf", None)
 
     def _isUninhabited(self):
-        return self.interval.is_empty()  \
+        return self.interval.empty \
             or utils.is_num(self.multipleOf) and self.multipleOf > self.maximum
 
     def updateInternalState(self):
@@ -581,7 +581,7 @@ def _isSubtype_nonTrivial(self, s):
                 for j in list(intervals):
                     if utils.are_intervals_mergable(num_schema.interval, j):
                         intervals.remove(j)
-                        intervals.append((num_schema.interval | j).to_atomic())
+                        intervals.append((num_schema.interval | j).enclosure)
                         added = True
                 if not added:
                     intervals.append(num_schema.interval)

jsonsubschema/_utils.py

@@ -13,7 +13,7 @@
 import json
 
 import jsonschema
-import intervals as I
+import portion as I
 from greenery.lego import parse
 
 import jsonsubschema.config as config

setup.py

@@ -19,7 +19,7 @@
     url='https://github.com/IBM/jsonsubschema',
     packages=['jsonsubschema', ],
     license='Apache License 2.0',
-    install_requires=['python-intervals', 'greenery', 'jsonschema', 'jsonref'],
+    install_requires=['portion', 'greenery', 'jsonschema', 'jsonref'],
     entry_points={
         'console_scripts': 'jsonsubschema=jsonsubschema.cli:main'
     }