Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spyder for openSUSE:Factory checked in at 2023-10-30 22:10:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spyder (Old) and /work/SRC/openSUSE:Factory/.spyder.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spyder" Mon Oct 30 22:10:17 2023 rev:49 rq:1121004 version:5.4.5 Changes: -------- --- /work/SRC/openSUSE:Factory/spyder/spyder.changes 2023-09-25 20:03:45.119347642 +0200 +++ /work/SRC/openSUSE:Factory/.spyder.new.17445/spyder.changes 2023-10-30 22:10:30.447601515 +0100 @@ -1,0 +2,6 @@ +Sun Oct 29 13:26:43 UTC 2023 - Ben Greiner <c...@bnavigator.de> + +- Raise pylint upper pin (requires update to python-lsp-server) + * Add spyder-pr21470-pylint3.diff + +------------------------------------------------------------------- New: ---- spyder-pr21470-pylint3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spyder.spec ++++++ --- /var/tmp/diff_new_pack.m38iAG/_old 2023-10-30 22:10:31.163627930 +0100 +++ /var/tmp/diff_new_pack.m38iAG/_new 2023-10-30 22:10:31.163627930 +0100 @@ -29,6 +29,7 @@ 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 +Patch0: spyder-pr21470-pylint3.diff BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base >= 3.7 @@ -81,9 +82,9 @@ Requires: python3-whatthepatch Requires: python3-yapf Requires: (python3-QDarkStyle >= 3.0.2 with python3-QDarkStyle < 3.2.0) -Requires: (python3-pylint >= 2.5.0 with python3-pylint < 3) +Requires: (python3-pylint >= 2.5.0 with python3-pylint < 3.1) Requires: (python3-python-lsp-black >= 1.2.0 with python3-python-lsp-black < 3) -Requires: (python3-python-lsp-server >= 1.7.4 with python3-python-lsp-server < 1.8) +Requires: (python3-python-lsp-server >= 1.7.4 with python3-python-lsp-server < 1.9) Requires: (python3-qtconsole >= 5.4.2 with python3-qtconsole < 5.5.0) Requires: (python3-spyder-kernels >= 2.4.4 with python3-spyder-kernels < 2.5) Recommends: %{name}-dicom @@ -178,8 +179,8 @@ BuildRequires: (python3-ipython >= 7.31.1 with python3-ipython < 9) BuildRequires: (python3-python-lsp-black >= 1.2.0 with python3-python-lsp-black < 3) BuildConflicts: (python3-ipython >= 8.8 with python3-ipython < 8.10.1) -BuildRequires: (python3-pylint >= 2.5.0 with python3-pylint < 3) -BuildRequires: (python3-python-lsp-server >= 1.7.4 with python3-python-lsp-server < 1.8) +BuildRequires: (python3-pylint >= 2.5.0 with python3-pylint < 3.1) +BuildRequires: (python3-python-lsp-server >= 1.7.4 with python3-python-lsp-server < 1.9) BuildRequires: (python3-qtconsole >= 5.4.2 with python3-qtconsole < 5.5) BuildRequires: (python3-spyder-kernels >= 2.4.4 with python3-spyder-kernels < 2.5) # /SECTION @@ -264,7 +265,9 @@ -e 's/(pyqt.*)<5.16/\1/' \ -e 's/(jedi.*)<0.19/\1<0.20/' \ -i setup.py requirements/main.yml binder/environment.yml -sed -i '/JEDI/ s/0.19/0.20/' spyder/dependencies.py +sed \ + -e '/JEDI_REQVER/ s/<0.19/<0.20/' \ + -i spyder/dependencies.py # Upstream brings its fixed versions for pyls, qdarksstyle and spyder-kernels for its # test environment, but we want to test against installed packages. ++++++ spyder-pr21470-pylint3.diff ++++++ Index: spyder-5.4.5/spyder/dependencies.py =================================================================== --- spyder-5.4.5.orig/spyder/dependencies.py +++ spyder-5.4.5/spyder/dependencies.py @@ -52,9 +52,9 @@ PEXPECT_REQVER = '>=4.4.0' PICKLESHARE_REQVER = '>=0.4' PSUTIL_REQVER = '>=5.3' PYGMENTS_REQVER = '>=2.0' -PYLINT_REQVER = '>=2.5.0,<3.0' +PYLINT_REQVER = '>=2.5.0,<3.1' PYLINT_VENV_REQVER = '>=3.0.2' -PYLSP_REQVER = '>=1.7.4,<1.8.0' +PYLSP_REQVER = '>=1.7.4,<1.9.0' PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYXDG_REQVER = '>=0.26' Index: spyder-5.4.5/spyder/plugins/pylint/utils.py =================================================================== --- spyder-5.4.5.orig/spyder/plugins/pylint/utils.py +++ spyder-5.4.5/spyder/plugins/pylint/utils.py @@ -24,7 +24,9 @@ except Exception: def _find_pylintrc_path(path): if pylint_config is not None: os.chdir(path) - return pylint_config.find_pylintrc() + for p in pylint_config.find_default_config_files(): + # return the first config found as str + return str(p) def get_pylintrc_path(search_paths=None, home_path=None): Index: spyder-5.4.5/binder/environment.yml =================================================================== --- spyder-5.4.5.orig/binder/environment.yml +++ spyder-5.4.5/binder/environment.yml @@ -25,13 +25,13 @@ dependencies: - pickleshare >=0.4 - psutil >=5.3 - pygments >=2.0 -- pylint >=2.5.0,<3.0 +- pylint >=2.5.0,<3.1 - pylint-venv >=3.0.2 - pyls-spyder >=0.4.0 - pyqt <5.16 - pyqtwebengine <5.16 - python-lsp-black >=1.2.0,<3.0.0 -- python-lsp-server >=1.7.4,<1.8.0 +- python-lsp-server >=1.7.4,<1.9.0 - pyxdg >=0.26 - pyzmq >=22.1.0 - qdarkstyle >=3.0.2,<3.2.0 Index: spyder-5.4.5/setup.py =================================================================== --- spyder-5.4.5.orig/setup.py +++ spyder-5.4.5/setup.py @@ -223,13 +223,13 @@ install_requires = [ 'pickleshare>=0.4', 'psutil>=5.3', 'pygments>=2.0', - 'pylint>=2.5.0,<3.0', + 'pylint>=2.5.0,<3.1', 'pylint-venv>=3.0.2', 'python-lsp-black>=1.2.0,<3.0.0', 'pyls-spyder>=0.4.0', 'pyqt5<5.16', 'pyqtwebengine<5.16', - 'python-lsp-server[all]>=1.7.4,<1.8.0', + 'python-lsp-server[all]>=1.7.4,<1.9.0', 'pyxdg>=0.26;platform_system=="Linux"', 'pyzmq>=22.1.0', 'qdarkstyle>=3.0.2,<3.2.0',
