From 7bf3daf32ffbc40841c1bfd6cd5ad9abc3b1e897 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 7 Sep 2017 16:12:33 -0500 Subject: [PATCH 1/3] Remove setup.cfg to not create universal wheels --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 3c6e79cf31d..00000000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=1 From db4e861674e85fc5f0186a884d305af581261050 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Thu, 7 Sep 2017 16:15:24 -0500 Subject: [PATCH 2/3] Release: Add instructions to create wheels with Python 2 and 3 --- RELEASE.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 87ef2595f11..11903837726 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -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' From 7768895d6f0872a507d32b3be7871e8a2334de15 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Fri, 8 Sep 2017 10:57:24 -0500 Subject: [PATCH 3/3] Testing: Skip test_ctrl_c_dbg in our CIs --- spyder/plugins/tests/test_ipythonconsole.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spyder/plugins/tests/test_ipythonconsole.py b/spyder/plugins/tests/test_ipythonconsole.py index 8f2d489846c..91694511079 100644 --- a/spyder/plugins/tests/test_ipythonconsole.py +++ b/spyder/plugins/tests/test_ipythonconsole.py @@ -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