avoid utils.version dependency in split repos

jupyter_nbconvert/utils/version.py

@@ -0,0 +1,25 b''
+# encoding: utf-8
+"""
+Utilities for version comparison
+
+It is a bit ridiculous that we need these.
+"""
+
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+from distutils.version import LooseVersion
+
+
+def check_version(v, check):
+    """check version string v >= check
+
+    If dev/prerelease tags result in TypeError for string-number comparison,
+    it is assumed that the dependency is satisfied.
+    Users on dev branches are responsible for keeping their own packages up to date.
+    """
+    try:
+        return LooseVersion(v) >= LooseVersion(check)
+    except TypeError:
+        return True
+

IPython/html/terminal/__init__.py

@@ -1,7 +1,7 b''
 import os
 
 import terminado
-from IPython.utils.version import check_version
+from ..utils import check_version
 
 if not check_version(terminado.__version__, '0.3.3'):
     raise ImportError("terminado >= 0.3.3 required, found %s" % terminado.__version__)

IPython/html/utils.py

@@ -9,6 +9,7 b' import errno'
 import os
 import stat
 import sys
+from distutils.version import LooseVersion
 
 try:
     from urllib.parse import quote, unquote
@@ -142,6 +143,19 b" def to_api_path(os_path, root=''):"
     return path
 
 
+def check_version(v, check):
+    """check version string v >= check
+
+    If dev/prerelease tags result in TypeError for string-number comparison,
+    it is assumed that the dependency is satisfied.
+    Users on dev branches are responsible for keeping their own packages up to date.
+    """
+    try:
+        return LooseVersion(v) >= LooseVersion(check)
+    except TypeError:
+        return True
+
+
 # Copy of IPython.utils.process.check_pid:
 
 def _check_pid_win32(pid):

jupyter_nbconvert/filters/markdown.py

@@ -23,8 +23,8 b' except ImportError as e:'
 
 from jupyter_nbconvert.utils.pandoc import pandoc
 from jupyter_nbconvert.utils.exceptions import ConversionException
+from jupyter_nbconvert.utils.version import check_version
 from IPython.utils.py3compat import cast_bytes
-from IPython.utils.version import check_version
 
 
 marked = os.path.join(os.path.dirname(__file__), "marked.js")

jupyter_nbconvert/utils/pandoc.py

@@ -9,9 +9,8 b' import warnings'
 import re
 from io import TextIOWrapper, BytesIO
 
-from IPython.utils.py3compat import cast_bytes
-from IPython.utils.version import check_version
-from IPython.utils.py3compat import which
+from jupyter_nbconvert.utils.version import check_version
+from IPython.utils.py3compat import cast_bytes, which
 
 from .exceptions import ConversionException