diff --git a/README.md b/README.md index ebdc37c1983..91636309080 100644 --- a/README.md +++ b/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. diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 1d019baf85c..4f208a914bc 100644 --- a/conda.recipe/meta.yaml +++ b/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 diff --git a/doc/installation.rst b/doc/installation.rst index 6fbf27a980e..d1cc2a29922 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -160,7 +160,7 @@ The requirements to run Spyder are: * `Qtconsole `_ >=4.2.0 -- for an enhanced Python interpreter. -* `Rope `_ >=0.9.4 and +* `Rope `_ >=0.10.5 and `Jedi `_ >=0.9.0 -- for code completion, go-to-definition and calltips on the Editor. diff --git a/requirements/requirements.txt b/requirements/requirements.txt index a94aacd1b16..5d335425ef0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,4 +1,4 @@ -rope>=0.9.4 +rope>=0.10.5 jedi>=0.9.0 pyflakes pygments>=2.0 diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000000..3c6e79cf31d --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 diff --git a/setup.py b/setup.py index a34462ed253..c340679da93 100644 --- a/setup.py +++ b/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',