Skip to content

Commit fb402d1

Browse files
committed
Merge pull request #2886 from ccordoba12/remove-pyside-support
Remove official support for PySide
2 parents 7050121 + 7ec94c0 commit fb402d1

File tree

8 files changed

+26
-27
lines changed

8 files changed

+26
-27
lines changed

Diff for: README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ Spyder is a Python development environment with a lot of features:
4545

4646
* **History log**
4747

48-
Spyder may also be used as a PyQt4/PySide extension library (module
48+
Spyder may also be used as a PyQt5/PyQt4 extension library (module
4949
`spyderlib`). For example, the Python interactive shell widget used in
50-
Spyder may be embedded in your own PyQt4/PySide application.
50+
Spyder may be embedded in your own PyQt5/PyQt4 application.
5151

5252

5353
## Documentation
@@ -105,14 +105,14 @@ For more details on supported platforms, please refer to our
105105
[installation instructions](http://pythonhosted.org/spyder/installation.html).
106106

107107
**Important note**: This does not install the graphical Python libraries (i.e.
108-
PyQt4, PyQt5 or PySide) that Spyder depend on. Those have to be installed
109-
separately after installing Python.
108+
PyQt5 or PyQt4) that Spyder depend on. Those have to be installed separately
109+
after installing Python.
110110

111111

112112
## Running from source
113113

114114
The fastest way to run Spyder is to get the source code using git, install
115-
PyQt4, PyQt5 or PySide, and run these commands:
115+
PyQt5 or PyQt4, and run these commands:
116116

117117
1. `pip install qtawesome` or `conda install -c spyder-ide qtawesome`
118118
2. `cd /your/spyder/git-clone`
@@ -137,7 +137,7 @@ a Python version greater than 2.7 (Python 3.2 is not supported anymore).
137137
### Runtime dependencies
138138

139139
* **Python** 2.7 or 3.3+
140-
* **PyQt4** 4.6+, **PyQt5** 5.2+ or **PySide** 1.2.0+: PyQt4 is recommended.
140+
* **PyQt5** 5.2+ or **PyQt4** 4.6+: PyQt5 is recommended.
141141
* **IPython** 3.0 or **qtconsole**: Enhanced Python interpreter.
142142
* **Rope** and/or **Jedi** 0.8.1: Editor code completion, calltips
143143
and go-to-definition.

Diff for: bootstrap.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
options.""")
3434
parser.add_option('--gui', default=None,
3535
help="GUI toolkit: pyqt5 (for PyQt5), pyqt (for PyQt4) or "
36-
"pyside (for PySide)")
36+
"pyside (for PySide, deprecated)")
3737
parser.add_option('--hide-console', action='store_true',
3838
default=False, help="Hide parent console window (Windows only)")
3939
parser.add_option('--test', dest="test", action='store_true', default=False,
@@ -109,15 +109,16 @@
109109
if options.gui is None:
110110
try:
111111
import PyQt5 # analysis:ignore
112-
print("02. PyQt5 is detected, selecting (experimental)")
112+
print("02. PyQt5 is detected, selecting")
113113
os.environ['QT_API'] = 'pyqt5'
114114
except ImportError:
115115
try:
116-
import PySide # analysis:ignore
117-
print("02. PySide is detected, selecting")
118-
os.environ['QT_API'] = 'pyside'
116+
import PyQt4 # analysis:ignore
117+
print("02. PyQt4 is detected, selecting")
118+
os.environ['QT_API'] = 'pyqt'
119119
except ImportError:
120-
print("02. No PyQt5 or PySide detected, using PyQt4 if available")
120+
print("02. No PyQt5 or PyQt4 detected, using PySide if available "
121+
"(deprecated)")
121122
else:
122123
print ("02. Skipping GUI toolkit detection")
123124
os.environ['QT_API'] = options.gui

Diff for: doc/installation.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,9 @@ The minimal requirements to run Spyder are
155155

156156
* `Python <http://www.python.org/>`_ 2.6+
157157

158-
* `PyQt4 <http://www.riverbankcomputing.co.uk/software/pyqt/download>`_ >= v4.6 or
159-
`PySide <http://pyside.org/>`_ >=1.2.0 (PyQt4 is recommended).
158+
* `PyQt5 <https://www.riverbankcomputing.com/software/pyqt/download5>`_ >= v5.2 or
159+
`PyQt4 <https://www.riverbankcomputing.com/software/pyqt/download>`_ >=4.6.0
160+
(PyQt5 is recommended).
160161

161162

162163
Recommended modules

Diff for: doc/overview.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ Key features:
7575
* :doc:`projectexplorer` (support Pydev project import)
7676

7777

78-
Spyder may also be used as a PyQt4 or PySide extension library
79-
(module 'spyderlib'). For example, the Python interactive shell widget
80-
used in Spyder may be embedded in your own PyQt4 or PySide application.
78+
Spyder may also be used as a PyQt5 or PyQt4 extension library
79+
(module 'spyderlib'). For example, the Python interactive shell widget
80+
used in Spyder may be embedded in your own PyQt5 or PyQt4 application.

Diff for: setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@ def run(self):
248248
long_description=WININST_MSG + \
249249
"""Spyder is an interactive Python development environment providing
250250
MATLAB-like features in a simple and light-weighted software.
251-
It also provides ready-to-use pure-Python widgets to your PyQt4 or
252-
PySide application: source code editor with syntax highlighting and
251+
It also provides ready-to-use pure-Python widgets to your PyQt5 or
252+
PyQt4 application: source code editor with syntax highlighting and
253253
code introspection/analysis features, NumPy array editor, dictionary
254254
editor, Python console, etc.""",
255255
download_url='%s/files/%s-%s.zip' % (__project_url__, NAME, __version__),
256256
author="The Spyder Development Team",
257257
url=__project_url__,
258258
license='MIT',
259-
keywords='PyQt4 PySide editor shell console widgets IDE',
259+
keywords='PyQt5 PyQt4 editor shell console widgets IDE',
260260
platforms=['any'],
261261
packages=get_packages(),
262262
package_data={LIBNAME: get_package_data(LIBNAME, EXTLIST),

Diff for: spyderlib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def get_versions(reporev=True):
8080
'python': platform.python_version(), # "2.7.3"
8181
'bitness': 64 if sys.maxsize > 2**32 else 32,
8282
'qt': spyderlib.qt.QtCore.__version__,
83-
'qt_api': spyderlib.qt.API_NAME, # PySide or PyQt4
83+
'qt_api': spyderlib.qt.API_NAME, # PyQt5 or PyQt4
8484
'qt_api_ver': spyderlib.qt.__version__,
8585
'system': system, # Linux, Windows, ...
8686
'revision': revision, # '9fdf926eccce'

Diff for: spyderlib/qt/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Licensed under the terms of the MIT License
66
# (see spyderlib/__init__.py for details)
77

8-
"""Transitional package (PyQt4 --> PySide)"""
8+
"""Spyder Qt Shim"""
99

1010
import os
1111

Diff for: spyderlib/requirements.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ def check_path():
3535

3636
def check_qt():
3737
"""Check Qt binding requirements"""
38-
qt_infos = dict(pyqt5=("PyQt5", "5.2"), pyqt=("PyQt4", "4.6"),
39-
pyside=("PySide", "1.2.0"))
38+
qt_infos = dict(pyqt5=("PyQt5", "5.2"), pyqt=("PyQt4", "4.6"))
4039
try:
4140
from spyderlib import qt
4241
package_name, required_ver = qt_infos[qt.API]
@@ -47,9 +46,7 @@ def check_qt():
4746
% (package_name, required_ver, actual_ver))
4847
except ImportError:
4948
show_warning("Please check Spyder installation requirements:\n\n"
50-
"%s %s+ or\n"
5149
"%s %s+ or\n"
5250
"%s %s+\n\n"
5351
"is required to run Spyder"
54-
% (qt_infos['pyqt'] + qt_infos['pyside'] + \
55-
qt_infos['pyqt5']))
52+
% (qt_infos['pyqt5'] + qt_infos['pyqt']))

0 commit comments

Comments
 (0)