Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update minimal required version of several of our dependencies #3253

Merged
merged 4 commits into from
Jun 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,20 @@ a Python version greater than 2.7 (Python 3.2 is not supported anymore).

* **Python** 2.7 or 3.3+
* **PyQt5** 5.2+ or **PyQt4** 4.6+: PyQt5 is recommended.
* **qtconsole**: Enhanced Python interpreter.
* **qtconsole** 4.2.0+: Enhanced Python interpreter.
* **Rope** and **Jedi**: Editor code completion, calltips
and go-to-definition.
* **Pyflakes**: Real-time code analysis.
* **Sphinx**: Rich text mode for the Help pane.
* **Pygments**: Syntax highlighting for all file types it supports.
* **Pygments** 2.0+: Syntax highlighting for all file types it supports.
* **Pylint**: Static code analysis.
* **Pep8**: Style analysis.
* **Psutil**: CPU and memory usage on the status bar.
* **Nbconvert**: Manipulation of notebooks in the Editor.
* **Qtawesome**: To have an icon theme based on FontAwesome.
* **Pickleshare**: Show import completions on the Python consoles.
* **PyZMQ**: Run introspection services asynchronously.
* **QtPy**: Abstracion layer for Python Qt bindings so that Spyder can run on PyQt4
* **QtPy** 1.0.2+: Abstracion layer for Python Qt bindings so that Spyder can run on PyQt4
and PyQt5.

### Optional dependencies
Expand Down
6 changes: 3 additions & 3 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ requirements:
- rope # [py27]
- pyflakes
- jedi
- qtconsole
- qtconsole >=4.2.0
- nbconvert
- pygments
- pygments >=2.0
- sphinx
- pep8
- psutil
- pylint
- qtawesome
- qtpy >=1.0.2
- qtpy >=1.0.2
- pyzmq

about:
Expand Down
19 changes: 10 additions & 9 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ The requirements to run Spyder are:
`PyQt4 <https://www.riverbankcomputing.com/software/pyqt/download>`_ >=4.6.0
(PyQt5 is recommended).

* `Qtconsole <http://jupyter.org/qtconsole/stable/>`_ >=4.0 -- for an
* `Qtconsole <http://jupyter.org/qtconsole/stable/>`_ >=4.2.0 -- for an
enhanced Python interpreter.

* `Rope <http://rope.sourceforge.net/>`_ >=0.9.4 and
Expand All @@ -170,8 +170,8 @@ The requirements to run Spyder are:
* `Sphinx <http://sphinx.pocoo.org>`_ -- for the Help pane rich text mode
and to get our documentation.

* `Pygments <http://pygments.org/>`_ -- for syntax highlighting in the Editor of
all file types it supports.
* `Pygments <http://pygments.org/>`_ >=2.0 -- for syntax highlighting and code
completion in the Editor of all file types it supports.

* `Pylint <http://www.logilab.org/project/pylint>`_ -- for static code analysis.

Expand All @@ -191,22 +191,23 @@ The requirements to run Spyder are:
* `PyZMQ <https://github.com/zeromq/pyzmq>`_ -- To run introspection services on the
Editor asynchronously.

* `QtPy <https://github.com/spyder-ide/qtpy>`_ -- To run Spyder in PyQt4 and PyQt5.
* `QtPy <https://github.com/spyder-ide/qtpy>`_ >=1.0.2 -- To run Spyder in PyQt4 and
PyQt5.


Optional modules
~~~~~~~~~~~~~~~~

* `Matplotlib <http://matplotlib.sourceforge.net/>`_ -- for 2D and 3D plotting in
the consoles.
* `Matplotlib <http://matplotlib.sourceforge.net/>`_ >=1.0 -- for 2D and 3D plotting
in the consoles.

* `Pandas <http://pandas.pydata.org/>`_ -- for view and editing DataFrames and
Series in the Variable Explorer.
* `Pandas <http://pandas.pydata.org/>`_ >=0.13.1 -- for view and editing DataFrames
and Series in the Variable Explorer.

* `Numpy <http://numpy.scipy.org/>`_ -- for view and editing two or three
dimensional arrays in the Variable Explorer.

* `Sympy <http://www.sympy.org/es/>`_ -- for working with symbolic mathematics
* `Sympy <http://www.sympy.org/es/>`_ >=0.7.3 -- for working with symbolic mathematics
in the IPython console.

* `Scipy <http://www.scipy.org/>`_ -- for importing Matlab workspace files in
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ def run(self):
'rope_py3k' if PY3 else 'rope>=0.9.4',
'jedi',
'pyflakes',
'pygments',
'qtconsole',
'pygments>=2.0',
'qtconsole>=4.2.0',
'nbconvert',
'sphinx',
'pep8',
Expand Down
2 changes: 1 addition & 1 deletion spyderlib/plugins/ipythonconsole.py
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ def show_intro(self):
@Slot()
def show_guiref(self):
"""Show qtconsole help"""
from IPython.core.usage import gui_reference
from qtconsole.usage import gui_reference
self.help.show_rich_text(gui_reference, collapse=True)

@Slot()
Expand Down
2 changes: 1 addition & 1 deletion spyderlib/utils/syntaxhighlighters.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from spyderlib.utils.sourcecode import CELL_LANGUAGES


PYGMENTS_REQVER = '>=1.6'
PYGMENTS_REQVER = '>=2.0'
dependencies.add("pygments", _("Syntax highlighting for Matlab, Julia and "
"other file types"),
required_version=PYGMENTS_REQVER)
Expand Down
8 changes: 4 additions & 4 deletions spyderlib/widgets/ipython.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,12 @@ def set_ipyclient(self, ipyclient):
"""Bind this shell widget to an IPython client one"""
self.ipyclient = ipyclient
self.exit_requested.connect(ipyclient.exit_callback)

def long_banner(self):
"""Banner for IPython widgets with pylab message"""
from IPython.core.usage import default_gui_banner
banner = default_gui_banner
from IPython.core.usage import default_banner
banner = default_banner

pylab_o = CONF.get('ipython_console', 'pylab', True)
autoload_pylab_o = CONF.get('ipython_console', 'pylab/autoload', True)
mpl_installed = programs.is_module_installed('matplotlib')
Expand Down