[rpms/spyder] f44: Update to 6.1.7

[rpms/spyder] f44: Update to 6.1.7

[Filipe Rosset]

            A new commit has been pushed.

            Repo   : rpms/spyder
            Branch : f44
            Commit : be5e62b5ad825e32a793d168cb3399b037a298cc
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-08-29T17:58:26-03:00
            Stats  : +11/-47 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/spyder/c/be5e62b5ad825e32a793d168cb3399b037a298cc?branch=f44

            Log:
            Update to 6.1.7

Resolves: rhbz#2525345

---
diff --git a/sources b/sources
index 05a7cbd..f8ff76f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (spyder-6.1.6.tar.gz) = 0159bcd0b7ea1f4b9bbc428cd5d154d199a8ec9c71d15f431e10a5000418343fea4ece9fd65c8ba19800bde7a9861f2fef0dfa391397bca6b420a1ee2d8ac7f7
+SHA512 (spyder-6.1.7.tar.gz) = 35953b23e7769b725337d928d139ac3d224e13b53fae2d2e2cc54ee6aa1bdebf614a6f99a6e775e2b59419713075cf17a585ce1a92a12b3838a0c87bca9a7010

diff --git a/spyder-traitlets-merge.patch b/spyder-traitlets-merge.patch
deleted file mode 100644
index e4aab7e..0000000
--- a/spyder-traitlets-merge.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 22befae5eb7a278073eeab26dcea1d1e150a3eaa Mon Sep 17 00:00:00 2001
-From: Thibaut Lunet <thibaut.lunet@tuhh.de>
-Date: Sun, 2 Aug 2026 17:09:23 +0200
-Subject: [PATCH] Remove usage of old private attribute when merging Jupyter
- configs
-
-Fixes: https://github.com/spyder-ide/spyder/issues/26220
-Upstream PR: https://github.com/spyder-ide/spyder/pull/26221
----
- spyder/plugins/ipythonconsole/widgets/main_widget.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spyder/plugins/ipythonconsole/widgets/main_widget.py b/spyder/plugins/ipythonconsole/widgets/main_widget.py
-index 36363250f95..debd51658fb 100644
---- a/spyder/plugins/ipythonconsole/widgets/main_widget.py
-+++ b/spyder/plugins/ipythonconsole/widgets/main_widget.py
-@@ -1900,7 +1900,7 @@ def config_options(self):
- 
-         # Merge QtConsole and Spyder configs. Spyder prefs will have
-         # prevalence over QtConsole ones
--        cfg._merge(spy_cfg)
-+        cfg.merge(spy_cfg)
-         return cfg
- 
-     def additional_options(self, special=None):
--- 

diff --git a/spyder.spec b/spyder.spec
index dd94bee..9777cab 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/spyder-ide/spyder
 %global tag v%{version}
-Version:        6.1.6
+Version:        6.1.7
 %forgemeta
 
 Name:           spyder
@@ -19,10 +19,6 @@ Summary:        Scientific Python Development Environment
 License:        MIT AND BSD-3-Clause
 URL:            https://www.spyder-ide.org/
 Source:         %forgesource
-# Fix traitlets >= 5.16 compatibility (AttributeError: _merge)
-# https://github.com/spyder-ide/spyder/issues/26220
-# https://github.com/spyder-ide/spyder/pull/26221
-Patch:          spyder-traitlets-merge.patch
 
 
 
@@ -40,6 +36,10 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  dos2unix
 BuildRequires:  libappstream-glib
 BuildRequires:  python3-devel
+BuildRequires:  python3dist(python-lsp-black) >= 2
+BuildRequires:  python3dist(python-lsp-ruff) >= 2.3
+BuildRequires:  python3dist(python-lsp-server) >= 1.13
+BuildRequires:  python3dist(spyder-kernels) >= 3.1
 
 %global appname org.spyder_ide.spyder
 
@@ -64,8 +64,6 @@ Summary:    %{summary}
 
 Requires:       hicolor-icon-theme
 Requires:       mathjax
-Requires:       python3-pylint
-Requires:       python3-pylint-venv
 Requires:       python3dist(python-lsp-black) >= 2
 Requires:       python3dist(python-lsp-ruff) >= 2.3
 Requires:       python3dist(python-lsp-server) >= 1.13
@@ -85,14 +83,6 @@ find . -type f \( \
     -name '*.rst' -o -name '*.md' -o -name '*.py' -o -name '*.css' \
     \) -exec dos2unix --keepdate '{}' '+'
 
-# Temporary measure since the 6.x pre-releases are behind stable 5.x
-# releases wrt to the version boundaries of dependencies, but we would
-# like to keep rawhide and F39 in sync.
-# Drop dependency on linters (pylint and pylint-venv)
-sed -i \
--e '/pylint>.*/d' \
--e '/pylint-venv>.*/d' setup.py
-
 # Drop runtime requirements from setup.py to avoid build-time dependency issues
 sed -i \
     -e '/python-lsp-black/d' \
@@ -103,12 +93,8 @@ sed -i -e "s/PYLSP_REQVER = .*/PYLSP_REQVER = '>=1.13.0'/g" spyder/dependencies.
 sed -i -e "s/SPYDER_KERNELS_REQVER = .*/SPYDER_KERNELS_REQVER = '>=3.1.0'/g" spyder/dependencies.py
 
 
-# Don't show warning regarding newer version
-sed -r -i "s|(PYLINT_REQVER.*),<.*'|\1'|" spyder/dependencies.py
-
-
 %generate_buildrequires
-%pyproject_buildrequires
+%pyproject_buildrequires -r
 
 
 %build
@@ -133,6 +119,7 @@ ln -s spyder %{buildroot}%{_bindir}/spyder3
 
 
 %check
+desktop-file-validate %{buildroot}%{_datadir}/applications/spyder.desktop
 # Still required by guidelines for now since Fedora uses appstream-builder
 # (https://pagure.io/packaging-committee/issue/1053):
 appstream-util validate-relax --nonet \
@@ -141,6 +128,9 @@ appstream-util validate-relax --nonet \
 appstreamcli validate --no-net --explain \
     %{buildroot}/%{_metainfodir}/%{appname}.appdata.xml
 
+export QT_QPA_PLATFORM=offscreen
+%pyproject_check_import -t
+
 
 %files -n python3-spyder -f %{pyproject_files}
 %doc CHANGELOG.md