sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-19 12:24:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #98 from setrofim/master

Browse Source 
ipython: switched to using LooseVersion for version checks.
This commit is contained in:
Sebastian Goscik 2016-02-10 10:54:00 +00:00
commit cb46c57754
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wlauto/utils/ipython.py
View File

@ -16,7 +16,7 @@
import os import os
import subprocess import subprocess
from distutils.version import StrictVersion from distutils.version import LooseVersion
# pylint: disable=wrong-import-position,ungrouped-imports # pylint: disable=wrong-import-position,ungrouped-imports
import_error_str = '' import_error_str = ''
@ -36,7 +36,7 @@ NBFORMAT_VERSION = 3
if IPython: if IPython:
if StrictVersion('5.0.0') > StrictVersion(IPython.__version__) >= StrictVersion('4.0.0'): if LooseVersion('5.0.0') > LooseVersion(IPython.__version__) >= LooseVersion('4.0.0'):
import nbformat import nbformat
from jupyter_client.manager import KernelManager from jupyter_client.manager import KernelManager
@ -51,7 +51,7 @@ if IPython:
IPYTHON_NBCONVERT_HTML = ['jupyter', 'nbconvert', '--to html'] IPYTHON_NBCONVERT_HTML = ['jupyter', 'nbconvert', '--to html']
IPYTHON_NBCONVERT_PDF = ['jupyter', 'nbconvert', '--to pdf'] IPYTHON_NBCONVERT_PDF = ['jupyter', 'nbconvert', '--to pdf']
elif StrictVersion('4.0.0') > StrictVersion(IPython.__version__) >= StrictVersion('3.0.0'): elif LooseVersion('4.0.0') > LooseVersion(IPython.__version__) >= LooseVersion('3.0.0'):
from IPython.kernel import KernelManager from IPython.kernel import KernelManager
import IPython.nbformat import IPython.nbformat
@ -65,7 +65,7 @@ if IPython:
IPYTHON_NBCONVERT_HTML = ['ipython', 'nbconvert', '--to=html'] IPYTHON_NBCONVERT_HTML = ['ipython', 'nbconvert', '--to=html']
IPYTHON_NBCONVERT_PDF = ['ipython', 'nbconvert', '--to=pdf'] IPYTHON_NBCONVERT_PDF = ['ipython', 'nbconvert', '--to=pdf']
elif StrictVersion('3.0.0') > StrictVersion(IPython.__version__) >= StrictVersion('2.0.0'): elif LooseVersion('3.0.0') > LooseVersion(IPython.__version__) >= LooseVersion('2.0.0'):
from IPython.kernel import KernelManager from IPython.kernel import KernelManager
import IPython.nbformat.v3 import IPython.nbformat.v3