Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spyder for openSUSE:Factory checked in at 2021-07-18 23:45:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spyder (Old) and /work/SRC/openSUSE:Factory/.spyder.new.2632 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spyder" Sun Jul 18 23:45:03 2021 rev:26 rq:906167 version:5.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/spyder/spyder.changes 2021-06-24 18:23:17.996964523 +0200 +++ /work/SRC/openSUSE:Factory/.spyder.new.2632/spyder.changes 2021-07-18 23:45:14.886908065 +0200 @@ -1,0 +2,10 @@ +Tue Jul 13 13:36:29 UTC 2021 - Ben Greiner <c...@bnavigator.de> + +- Replace python-python-language-server with python-lsp-server + * spyder-pr15657-python-lsp-server.patch + * gh#spyder-ide/spyder#15657 +- Support pytest-qt >= 4 + * spyder-pr16011-pytest-qt-4.patch + * gh#spyder-ide/spyder#16011 + +------------------------------------------------------------------- New: ---- spyder-pr15657-python-lsp-server.patch spyder-pr16011-pytest-qt-4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spyder.spec ++++++ --- /var/tmp/diff_new_pack.vwWOnT/_old 2021-07-18 23:45:15.422903941 +0200 +++ /var/tmp/diff_new_pack.vwWOnT/_new 2021-07-18 23:45:15.426903911 +0200 @@ -26,6 +26,10 @@ URL: https://www.spyder-ide.org/ Source: https://github.com/spyder-ide/spyder/archive/v%{version}.tar.gz#/spyder-%{version}.tar.gz Source1: spyder-rpmlintrc +# PATCH-FIX-UPSTREAM spyder-pr15657-python-lsp-server.patch -- gh#spyder-ide/spyder#15657 +Patch0: spyder-pr15657-python-lsp-server.patch +# PATCH-FIX-UPSTREAM spyder-pr16011-pytest-qt-4.patch -- gh#spyder-ide/spyder#16011 +Patch1: spyder-pr16011-pytest-qt-4.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-setuptools >= 39.0.0 @@ -60,9 +64,9 @@ Requires: python3-pydocstyle >= 2.0.0 Requires: python3-pyflakes >= 2.2.0 Requires: python3-pylint >= 2.5.0 -Requires: python3-pyls-black >= 0.4.6 -Requires: python3-pyls-spyder >= 0.3.2 -Requires: python3-python-language-server >= 0.36.2 +Requires: python3-pyls-spyder >= 0.4.0 +Requires: python3-python-lsp-black >= 1.0.0 +Requires: python3-python-lsp-server >= 1.0.0 Requires: python3-pyxdg >= 0.26 Requires: python3-pyzmq >= 17 Requires: python3-qstylizer >= 0.1.10 @@ -143,15 +147,15 @@ BuildRequires: python3-pydocstyle >= 2.0.0 BuildRequires: python3-pyflakes >= 2.2.0 BuildRequires: python3-pylint >= 2.5.0 -BuildRequires: python3-pyls-black >= 0.4.6 -BuildRequires: python3-pyls-spyder >= 0.3.0 +BuildRequires: python3-pyls-spyder >= 0.4.0 BuildRequires: python3-pytest >= 5.0 BuildRequires: python3-pytest-lazy-fixture BuildRequires: python3-pytest-mock BuildRequires: python3-pytest-order BuildRequires: python3-pytest-qt BuildRequires: python3-pytest-timeout -BuildRequires: python3-python-language-server >= 0.36.2 +BuildRequires: python3-python-lsp-black >= 1.0.0 +BuildRequires: python3-python-lsp-server >= 1.0.0 BuildRequires: python3-pyxdg >= 0.26 BuildRequires: python3-pyzmq >= 17 BuildRequires: python3-qstylizer >= 0.1.10 ++++++ spyder-pr15657-python-lsp-server.patch ++++++ ++++ 19754 lines (skipped) ++++++ spyder-pr16011-pytest-qt-4.patch ++++++ Index: spyder-5.0.5/binder/environment.yml =================================================================== --- spyder-5.0.5.orig/binder/environment.yml +++ spyder-5.0.5/binder/environment.yml @@ -66,7 +66,7 @@ dependencies: - pytest-lazy-fixture - pytest-mock - pytest-order -- pytest-qt <4.0 +- pytest-qt - pytest-xvfb - pyyaml - scipy Index: spyder-5.0.5/requirements/tests.txt =================================================================== --- spyder-5.0.5.orig/requirements/tests.txt +++ spyder-5.0.5/requirements/tests.txt @@ -13,7 +13,7 @@ pytest-cov pytest-lazy-fixture pytest-mock pytest-order -pytest-qt <4.0 +pytest-qt pyyaml scipy sympy Index: spyder-5.0.5/spyder/plugins/findinfiles/tests/test_plugin.py =================================================================== --- spyder-5.0.5.orig/spyder/plugins/findinfiles/tests/test_plugin.py +++ spyder-5.0.5/spyder/plugins/findinfiles/tests/test_plugin.py @@ -32,7 +32,7 @@ def findinfiles(qtbot): # qtbot wants to close the widget findinfiles_plugin.close = lambda: True - qtbot.addWidget(findinfiles_plugin) + qtbot.addWidget(findinfiles_plugin.get_widget()) return findinfiles_plugin Index: spyder-5.0.5/spyder/plugins/history/tests/test_plugin.py =================================================================== --- spyder-5.0.5.orig/spyder/plugins/history/tests/test_plugin.py +++ spyder-5.0.5/spyder/plugins/history/tests/test_plugin.py @@ -39,7 +39,7 @@ def historylog(qtbot, monkeypatch): """ historylog = history.HistoryLog(None, configuration=CONF) historylog.close = lambda: True - qtbot.addWidget(historylog) + qtbot.addWidget(historylog.get_widget()) historylog.get_widget().show() yield historylog historylog.on_close() Index: spyder-5.0.5/spyder/plugins/workingdirectory/tests/test_workingdirectory.py =================================================================== --- spyder-5.0.5.orig/spyder/plugins/workingdirectory/tests/test_workingdirectory.py +++ spyder-5.0.5/spyder/plugins/workingdirectory/tests/test_workingdirectory.py @@ -19,7 +19,7 @@ NEW_DIR = 'new_workingdir' @pytest.fixture -def setup_workingdirectory(qtbot, request): +def setup_workingdirectory(request): """Setup working directory plugin.""" CONF.reset_to_defaults() use_startup_wdir = request.node.get_closest_marker('use_startup_wdir') @@ -36,14 +36,13 @@ def setup_workingdirectory(qtbot, reques workingdirectory = WorkingDirectory(None, configuration=CONF) workingdirectory.close = lambda: True - qtbot.addWidget(workingdirectory) - return workingdirectory, qtbot + return workingdirectory def test_basic_initialization(setup_workingdirectory): """Test Working Directory plugin initialization.""" - workingdirectory, qtbot = setup_workingdirectory + workingdirectory = setup_workingdirectory # Assert that workingdirectory exists assert workingdirectory is not None @@ -51,7 +50,7 @@ def test_basic_initialization(setup_work def test_get_workingdir(setup_workingdirectory): """Test the method that defines the working directory at home.""" - workingdirectory, qtbot = setup_workingdirectory + workingdirectory = setup_workingdirectory # Start the working directory on the home directory act_wdir = workingdirectory.get_workdir() assert act_wdir == get_home_dir() @@ -60,7 +59,7 @@ def test_get_workingdir(setup_workingdir @pytest.mark.use_startup_wdir def test_get_workingdir_startup(setup_workingdirectory): """Test the method that defines the working directory at home.""" - workingdirectory, qtbot = setup_workingdirectory + workingdirectory = setup_workingdirectory # Start the working directory on the home directory act_wdir = workingdirectory.get_workdir() folders = osp.split(act_wdir) Index: spyder-5.0.5/setup.py =================================================================== --- spyder-5.0.5.orig/setup.py +++ spyder-5.0.5/setup.py @@ -258,7 +258,7 @@ extras_require = { 'pytest-lazy-fixture', 'pytest-mock', 'pytest-order', - 'pytest-qt<4.0', + 'pytest-qt', 'pyyaml', 'scipy', 'sympy', Index: spyder-5.0.5/spyder/plugins/completion/providers/fallback/tests/conftest.py =================================================================== --- spyder-5.0.5.orig/spyder/plugins/completion/providers/fallback/tests/conftest.py +++ spyder-5.0.5/spyder/plugins/completion/providers/fallback/tests/conftest.py @@ -25,8 +25,6 @@ class CompletionManagerMock(QObject): def fallback_completions(qtbot_module, request): fallback = FallbackProvider(None, {}) completions = CompletionManagerMock(None) - qtbot_module.addWidget(fallback) - qtbot_module.addWidget(completions) with qtbot_module.waitSignal(fallback.sig_provider_ready, timeout=30000): fallback.start() Index: spyder-5.0.5/spyder/plugins/completion/providers/snippets/tests/conftest.py =================================================================== --- spyder-5.0.5.orig/spyder/plugins/completion/providers/snippets/tests/conftest.py +++ spyder-5.0.5/spyder/plugins/completion/providers/snippets/tests/conftest.py @@ -31,8 +31,6 @@ def snippets_completions(qtbot_module, r snippets = SnippetsProvider(None, dict(SnippetsProvider.CONF_DEFAULTS)) completions = CompletionManagerMock(None) - qtbot_module.addWidget(snippets) - qtbot_module.addWidget(completions) with qtbot_module.waitSignal(snippets.sig_provider_ready, timeout=30000): snippets.start()
