Merge from 3.x: PR #4602

Fixes #4285

README.md

@@ -143,7 +143,7 @@ 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** 4.2.0+: Enhanced Python interpreter.
-* **Rope** and **Jedi**: Editor code completion, calltips
+* **Rope** 0.10.5+ and **Jedi** 0.9.0+: Editor code completion, calltips
   and go-to-definition.
 * **Pyflakes**: Real-time code analysis.
 * **Sphinx**: Rich text mode for the Help pane.

conda.recipe/meta.yaml

@@ -18,10 +18,9 @@ requirements:
     - python.app  # [osx]
     - pyqt >=5.6.0  # [osx]
     - pyqt  # [not osx]
-    - rope 0.9.*  # [py34 or py35]
-    - rope  # [py27]
+    - rope >=0.10.5
     - pyflakes
-    - jedi
+    - jedi >=0.9.0
     - qtconsole >=4.2.0
     - nbconvert
     - pygments >=2.0

doc/installation.rst

@@ -160,7 +160,7 @@ The requirements to run Spyder are:
 * `Qtconsole <http://jupyter.org/qtconsole/stable/>`_ >=4.2.0 -- for an
   enhanced Python interpreter.
 
-* `Rope <http://rope.sourceforge.net/>`_ >=0.9.4 and
+* `Rope <http://rope.sourceforge.net/>`_ >=0.10.5 and
   `Jedi <http://jedi.jedidjah.ch/en/latest/>`_ >=0.9.0 -- for code completion,
   go-to-definition and calltips on the Editor.
 

requirements/requirements.txt

@@ -1,4 +1,4 @@
-rope>=0.9.4
+rope>=0.10.5
 jedi>=0.9.0
 pyflakes
 pygments>=2.0

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1

setup.py

@@ -272,7 +272,7 @@ def run(self):
     import setuptools     # analysis:ignore
 
 install_requires = [
-    'rope_py3k' if PY3 else 'rope>=0.9.4',
+    'rope>=0.10.5',
     'jedi>=0.9.0',
     'pyflakes',
     'pygments>=2.0',