Skip to content

Commit

Permalink
Merge from 3.x: PR #5164
Browse files Browse the repository at this point in the history
Fixes #5144
  • Loading branch information
ccordoba12 committed Sep 8, 2017
2 parents e045cc7 + 7d17baa commit a0b6698
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
12 changes: 9 additions & 3 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@ To release a new version of Spyder you need to follow these steps:

* python setup.py sdist upload

* python setup.py bdist_wheel --plat-name manylinux1_x86_64 upload
* python2 setup.py bdist_wheel --plat-name manylinux1_x86_64 upload

* python setup.py bdist_wheel --plat-name manylinux1_i686 upload
* python3 setup.py bdist_wheel --plat-name manylinux1_x86_64 upload

* python setup.py bdist_wheel upload
* python2 setup.py bdist_wheel --plat-name manylinux1_i686 upload

* python3 setup.py bdist_wheel --plat-name manylinux1_i686 upload

* python2 setup.py bdist_wheel upload

* python3 setup.py bdist_wheel upload

* git tag -a vX.X.X -m 'Release X.X.X'

Expand Down
2 changes: 0 additions & 2 deletions setup.cfg

This file was deleted.

3 changes: 2 additions & 1 deletion spyder/plugins/tests/test_ipythonconsole.py
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,8 @@ def test_mpl_backend_change(ipyconsole, qtbot):


@flaky(max_runs=10)
@pytest.mark.skipif(PYQT5, reason="It times out frequently in PyQt5")
@pytest.mark.skipif(os.environ.get('CI', None) is not None or PYQT5,
reason="It fails frequently in PyQt5 and our CIs")
def test_ctrl_c_dbg(ipyconsole, qtbot):
"""
Test that Ctrl+C works while debugging
Expand Down

0 comments on commit a0b6698

Please sign in to comment.