sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-21 12:28:44 +00:00
Code Issues Releases Wiki Activity

ipython: updated version check.

Browse Source 
Version 4.0.0 changes API and breaks WA's usage of it. Updated version
check to only initialize ipython utils if version is < 4.0.0.
This commit is contained in:
Sergei Trofimov 2015-09-02 17:39:11 +01:00
parent 3501eccb8e
commit c04b98c75a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wlauto/utils/ipython.py
View File

@ -34,7 +34,7 @@ NBFORMAT_VERSION = 3
if IPython: if IPython:
if StrictVersion(IPython.__version__) >= StrictVersion('3.0.0'): if StrictVersion('4.0.0') > StrictVersion(IPython.__version__) >= StrictVersion('3.0.0'):
import IPython.kernel import IPython.kernel
import IPython.nbformat import IPython.nbformat
@ -48,7 +48,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(IPython.__version__) >= StrictVersion('2.0.0'): elif StrictVersion('3.0.0') > StrictVersion(IPython.__version__) >= StrictVersion('2.0.0'):
import IPython.kernel import IPython.kernel
import IPython.nbformat.v3 import IPython.nbformat.v3