Merge from 4.x: PR spyder-ide#11517

Fixes spyder-ide#11497

Author: ccordoba12

binder/environment.yml

@@ -7,32 +7,35 @@ dependencies:
 # the contents of this requirements/conda.txt to this file.yml.
 # Please *DO NOT* make changes directly just to here - make changes
 # to requirements/conda.txt, and copy it here.
-- applaunchservices
-- atomicwrites
+- applaunchservices >=0.1.7
+- atomicwrites >=1.2.0
 - chardet >=2.0.0
-- cloudpickle
-- diff-match-patch
+- cloudpickle >=0.5.0
+- diff-match-patch >=20181111
 - intervaltree
+- ipython >=4.0
 - jedi =0.14.1
 - keyring
-- nbconvert
-- numpydoc
+- nbconvert >=4.0
+- numpydoc >=0.6.0
+- paramiko >=2.4.0
 - parso =0.5.2
-- pexpect
-- pickleshare
-- psutil
+- pexpect >=4.4.0
+- pickleshare >=0.4
+- psutil >=5.3
 - pygments >=2.0
-- pylint
+- pylint >=0.25
 - pyqt <5.13
+- pyyaml
 - python-language-server >=0.31.2,<0.32.0
-- pyxdg
-- pyzmq
+- pyxdg >=0.26
+- pyzmq >=17
 - qdarkstyle >=2.7
 - qtawesome >=0.5.7
 - qtconsole >=4.6.0
 - qtpy >=1.5.0
-- rtree
-- sphinx
+- rtree >=0.8.3
+- sphinx >=0.6.6
 - spyder-kernels >=1.8.1,<2.0.0
 - watchdog
 
@@ -41,22 +44,23 @@ dependencies:
 # the contents of this requirements/tests.txt to this file.yml.
 # Please *DO NOT* make changes directly just to here - make changes
 # to requirements/tests.txt, and copy it here.
+- coverage <5.0
+- cython
+- flaky
+- matplotlib
+- mock
+- pandas
+- pillow
 - pytest <5.0
 - pytest-mock
 - pytest-cov
 - pytest-qt
 - pytest-ordering
 - pytest-lazy-fixture
 - pytest-faulthandler <2.0
-- mock
-- pandas
+- pytest-xvfb
 - scipy
 - sympy
-- pillow
-- matplotlib
-- cython
-- flaky
-- coverage <5.0
 
 # Required for jupyter-desktop-server
 - websockify

requirements/conda.txt

@@ -2,31 +2,32 @@
 # So to get performant launches on mybinder.org, we have copied
 # the contents of this file to binder/environment.yml. If you
 # make changes here, please copy them over there too.
-applaunchservices
-atomicwrites
+applaunchservices >=0.1.7
+atomicwrites >=1.2.0
 chardet >=2.0.0
-cloudpickle
-diff-match-patch
+cloudpickle >=0.5.0
+diff-match-patch >=20181111
 intervaltree
+IPython >=4.0
 jedi =0.14.1
 keyring
-nbconvert
-numpydoc
+nbconvert >=4.0
+numpydoc >=0.6.0
+Paramiko >=2.4.0
 parso =0.5.2
-pexpect
-pickleshare
-psutil
+pexpect >=4.4.0
+pickleshare >=0.4
+psutil >=5.3
 pygments >=2.0
-pylint
+pylint >=0.25
 pyqt <5.13
 python-language-server >=0.31.2,<0.32.0
-pyxdg
-pyzmq
+pyxdg >=0.26
+pyzmq >=17
 qdarkstyle >=2.7
 qtawesome >=0.5.7
 qtconsole >=4.6.0
 qtpy >=1.5.0
-rtree
-sphinx
+sphinx >=0.6.6
 spyder-kernels >=1.8.1,<2.0.0
 watchdog

requirements/tests.txt

@@ -2,19 +2,20 @@
 # So to get performant launches on mybinder.org, we have copied
 # the contents of this file to binder/environment.yml. If you
 # make changes here, please copy them over there too.
+coverage <5.0
+cython
+flaky
+matplotlib
+mock
+pandas
+pillow
 pytest <5.0
-pytest-mock
 pytest-cov
-pytest-qt
-pytest-ordering
-pytest-lazy-fixture
 pytest-faulthandler <2.0
-mock
-pandas
+pytest-lazy-fixture
+pytest-mock
+pytest-ordering
+pytest-qt
+pyyaml
 scipy
 sympy
-pillow
-matplotlib
-cython
-flaky
-coverage <5.0

setup.py

@@ -200,61 +200,66 @@ def run(self):
     import setuptools     # analysis:ignore
 
 install_requires = [
-    'applaunchservices;platform_system=="Darwin"',
-    'atomicwrites',
+    'applaunchservices>=0.1.7;platform_system=="Darwin"',
+    'atomicwrites>=1.2.0',
     'chardet>=2.0.0',
-    'cloudpickle',
-    'diff-match-patch',
+    'cloudpickle>=0.5.0',
+    'diff-match-patch>=20181111',
     'intervaltree',
+    'ipython>=4.0',
     # This is here until Jedi 0.15+ fixes completions for
     # Numpy and Pandas
     'jedi==0.14.1',
     # Don't require keyring for Python 2 and Linux
     # because it depends on system packages
     'keyring;sys_platform!="linux2"',
-    'nbconvert',
-    'numpydoc',
+    'nbconvert>=4.0',
+    'numpydoc>=0.6.0',
     # Required to get SSH connections to remote kernels
-    'paramiko;platform_system=="Windows"',
+    'paramiko>=2.4.0;platform_system=="Windows"',
     'parso==0.5.2',
-    'pexpect',
-    'pickleshare',
-    'psutil',
+    'pexpect>=4.4.0',
+    'pickleshare>=0.4',
+    'psutil>=5.3',
     'pygments>=2.0',
-    'pylint',
+    'pylint>=0.25',
     'pyqt5<5.13;python_version>="3"',
     'pyqtwebengine<5.13;python_version>="3"',
     'python-language-server[all]>=0.31.2,<0.32.0',
     'pyxdg>=0.26;platform_system=="Linux"',
-    'pyzmq',
+    'pyzmq>=17',
     'qdarkstyle>=2.7',
     'qtawesome>=0.5.7',
     'qtconsole>=4.6.0',
     'qtpy>=1.5.0',
-    'sphinx',
+    'sphinx>=0.6.6',
     'spyder-kernels>=1.8.1,<2.0.0',
     'watchdog',
 ]
 
 extras_require = {
     'test:python_version == "2.7"': ['mock'],
+    'test:platform_system == "Linux"': ['pytest-xvfb'],
     'test:platform_system == "Windows"': ['pywin32'],
-    'test': ['pytest<5.0',
-             'pytest-qt',
-             'pytest-mock',
-             'pytest-cov',
-             'pytest-xvfb;platform_system=="Linux"',
-             'pytest-ordering',
-             'pytest-lazy-fixture',
-             'pytest-faulthandler',
-             'mock',
-             'flaky',
-             'pandas',
-             'scipy',
-             'sympy',
-             'pillow',
-             'matplotlib',
-             'cython'],
+    'test': [
+        'coverage<5.0',
+        'cython',
+        'flaky',
+        'matplotlib',
+        'mock',
+        'pandas',
+        'pillow',
+        'pytest<5.0',
+        'pytest-cov',
+        'pytest-faulthandler<2.0',
+        'pytest-lazy-fixture',
+        'pytest-mock',
+        'pytest-ordering',
+        'pytest-qt',
+        'pyyaml',
+        'scipy',
+        'sympy',
+    ],
 }
 
 if 'setuptools' in sys.modules:

spyder/app/tests/test_mainwindow.py

@@ -2505,7 +2505,7 @@ def test_debug_unsaved_file(main_window, qtbot):
 
 
 @pytest.mark.slow
-@flaky(max_runs=1)
+@flaky(max_runs=3)
 @pytest.mark.parametrize(
     "debug", [True, False])
 def test_runcell(main_window, qtbot, tmpdir, debug):