Commit 4dbcd51 1 parent be72293 commit 4dbcd51 Copy full SHA for 4dbcd51
File tree 1 file changed +2
-13
lines changed
1 file changed +2
-13
lines changed Original file line number Diff line number Diff line change 8
8
IPython configuration variables needed by Spyder
9
9
"""
10
10
11
- import os
12
-
13
11
from spyderlib .utils import programs
14
12
from spyderlib import dependencies
15
13
from spyderlib .baseconfig import _
16
14
17
- # Don't use spyderlib.qt.PYQT5 to avoid importing Qt here
18
- PYQT5 = os .environ .get ('QT_API' , None ) == 'pyqt5'
19
15
20
- IPYTHON_REQVER = '>=1 .0'
21
- ZMQ_REQVER = '>=2.1.11 '
16
+ IPYTHON_REQVER = '>=3 .0'
17
+ ZMQ_REQVER = '>=13.0.0 '
22
18
23
19
dependencies .add ("IPython" , _ ("IPython Console integration" ),
24
20
required_version = IPYTHON_REQVER )
25
21
dependencies .add ("zmq" , _ ("IPython Console integration" ),
26
22
required_version = ZMQ_REQVER )
27
23
28
24
def is_qtconsole_installed ():
29
- # Only IPython 3+ is compatible with PyQt5, so this will avoid a
30
- # crash for us
31
- # TODO: Remove this once IPython 3 is released
32
- if programs .is_module_installed ('IPython.qt' , '<3.0' ) and PYQT5 :
33
- return False
34
-
35
- # Check if pyzmq is installed too, else, what's the point?
36
25
pyzmq_installed = programs .is_module_installed ('zmq' , version = ZMQ_REQVER )
37
26
pygments_installed = programs .is_module_installed ('pygments' )
38
27
if programs .is_module_installed ('IPython.qt' ) and pyzmq_installed \
You can’t perform that action at this time.
0 commit comments