From 67d952d8c1112a9219cfac7c2cce745bf54cd479 Mon Sep 17 00:00:00 2001 From: Rafael Laverde Date: Tue, 13 Jun 2017 15:37:02 -0500 Subject: [PATCH 1/3] Move to support only Rope 0.10.5+ 0.10.5 is the first version to support Python 2 and 3 in the same package. also remove rope_py3k --- README.md | 2 +- conda.recipe/meta.yaml | 3 +-- doc/installation.rst | 2 +- requirements/requirements.txt | 2 +- setup.py | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ebdc37c1983..5dbeac67eed 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**: 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..97c544b6ffc 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -18,8 +18,7 @@ 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 - qtconsole >=4.2.0 diff --git a/doc/installation.rst b/doc/installation.rst index 1b255ddae28..788107fd528 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.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', From 03b4f9e6243b9f9dd19453907067668c52aff07b Mon Sep 17 00:00:00 2001 From: Rafael Laverde Date: Tue, 13 Jun 2017 15:45:09 -0500 Subject: [PATCH 2/3] Create universal wheels. --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 setup.cfg 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 From ccdef6d27a9efab96a41f41a0f122c9c4301e0fd Mon Sep 17 00:00:00 2001 From: Rafael Laverde Date: Wed, 14 Jun 2017 15:21:43 -0500 Subject: [PATCH 3/3] Add version of jedi (0.9.0+) in some missing places. --- README.md | 2 +- conda.recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5dbeac67eed..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** 0.10.5+ 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 97c544b6ffc..4f208a914bc 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -20,7 +20,7 @@ requirements: - pyqt # [not osx] - rope >=0.10.5 - pyflakes - - jedi + - jedi >=0.9.0 - qtconsole >=4.2.0 - nbconvert - pygments >=2.0