From 39d8c82e9a72c7bccc17a314e547c6bf3a5fc679 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Mon, 29 Feb 2016 11:02:25 -0500 Subject: [PATCH 1/5] Testing: Remove commands to install jedi with pip when using conda - Those are not needed anymore --- continuous_integration/appveyor/run_test.bat | 6 ------ continuous_integration/travis/run_test.sh | 5 ----- 2 files changed, 11 deletions(-) diff --git a/continuous_integration/appveyor/run_test.bat b/continuous_integration/appveyor/run_test.bat index 6ac55f9984a..d2168659a94 100644 --- a/continuous_integration/appveyor/run_test.bat +++ b/continuous_integration/appveyor/run_test.bat @@ -15,12 +15,6 @@ cd C:\projects\tmp REM Install the package we created conda install -q -y --use-local spyder==3.0.0b2 -REM Install missing deps -if %PYTHON_VERSION%==3.5 ( - pip install jedi - pip install pylint -) - REM Install extra packages conda install -q -y %EXTRA_PACKAGES% diff --git a/continuous_integration/travis/run_test.sh b/continuous_integration/travis/run_test.sh index ede842d7b39..f39addd6182 100755 --- a/continuous_integration/travis/run_test.sh +++ b/continuous_integration/travis/run_test.sh @@ -30,11 +30,6 @@ if [ "$USE_CONDA" = true ] ; then # Install extra packages conda install -q $EXTRA_PACKAGES - - # Jedi is not available in conda - if [ "$TRAVIS_PYTHON_VERSION" = "3.5" ]; then - pip install jedi - fi else cd $FULL_SPYDER_CLONE pip install dist/spyder-*.whl From 468d944bba1114e836b73546e4e731ed33d46def Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Mon, 29 Feb 2016 11:04:20 -0500 Subject: [PATCH 2/5] Testing: Remove Jedi pinnings in our conda recipes --- conda.recipe/meta.yaml | 2 +- continuous_integration/conda-recipes/spyder/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 8499ab1e9e0..66c8078f474 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -18,7 +18,7 @@ requirements: - pyqt - rope - pyflakes - - jedi 0.8* [py27 or py34] + - jedi - qtconsole - nbconvert - pygments diff --git a/continuous_integration/conda-recipes/spyder/meta.yaml b/continuous_integration/conda-recipes/spyder/meta.yaml index 65d06ab781b..9219d369a26 100644 --- a/continuous_integration/conda-recipes/spyder/meta.yaml +++ b/continuous_integration/conda-recipes/spyder/meta.yaml @@ -23,7 +23,7 @@ requirements: - {% if environ.get('USE_QT_API') == 'PyQt4' %} pyqt {% else %} pyqt5 {% endif %} - rope - pyflakes - - jedi [py27 or py34] + - jedi - qtconsole - nbconvert - pygments From 85e1b666fb95d0508099f5302583d6d2a1a1c817 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Mon, 29 Feb 2016 11:07:39 -0500 Subject: [PATCH 3/5] Testing: Restore Appveyor tests for Python 2.7 now that we don't test the whole app --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 896e011705c..4a4ff6a115d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,10 +2,10 @@ environment: matrix: - #- PYTHON: "C:\\Python27_64" - # PYTHON_VERSION: "2.7" - # PYTHON_ARCH: "64" - # USE_QT_API: "PyQt4" + - PYTHON: "C:\\Python27_64" + PYTHON_VERSION: "2.7" + PYTHON_ARCH: "64" + USE_QT_API: "PyQt4" - PYTHON: "C:\\Python35_64" PYTHON_VERSION: "3.5" From c085e331df29a98ad4f96b805d336aae54de3871 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Mon, 29 Feb 2016 11:37:10 -0500 Subject: [PATCH 4/5] Testing: Bump qtconsole version --- continuous_integration/conda-recipes/qtconsole/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/continuous_integration/conda-recipes/qtconsole/meta.yaml b/continuous_integration/conda-recipes/qtconsole/meta.yaml index 82ca1570ab7..f263ccd3271 100644 --- a/continuous_integration/conda-recipes/qtconsole/meta.yaml +++ b/continuous_integration/conda-recipes/qtconsole/meta.yaml @@ -1,14 +1,14 @@ package: name: qtconsole - version: 4.1.1 + version: 4.2.0 build: number: 99 source: - fn: qtconsole-4.1.1.tar.gz - url: https://pypi.python.org/packages/source/q/qtconsole/qtconsole-4.1.1.tar.gz - md5: 12f474ab467d2945249d149d2d32f208 + fn: qtconsole-4.2.0.tar.gz + url: https://pypi.python.org/packages/source/q/qtconsole/qtconsole-4.2.0.tar.gz + md5: d08f3f75d2fd7cfa2c863dac0c045d87 requirements: build: From ba2624e1ada93e5f40811710c6601c5b4901812d Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Mon, 29 Feb 2016 12:08:44 -0500 Subject: [PATCH 5/5] Testing: Remove selector for pylint in Spyder recipe --- continuous_integration/conda-recipes/spyder/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/conda-recipes/spyder/meta.yaml b/continuous_integration/conda-recipes/spyder/meta.yaml index 9219d369a26..c6934857cdb 100644 --- a/continuous_integration/conda-recipes/spyder/meta.yaml +++ b/continuous_integration/conda-recipes/spyder/meta.yaml @@ -30,7 +30,7 @@ requirements: - sphinx - pep8 - psutil - - pylint [not win] + - pylint - qtawesome - python.app [osx]