public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <rosset.filipe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/spyder] f45: [PATCH] Remove usage of old private attribute when merging Jupyter
Date: Sat, 29 Aug 2026 20:44:52 GMT [thread overview]
Message-ID: <178803629297.1.2121318874181206051.rpms-spyder-fa105aa64dfb@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/spyder
Branch : f45
Commit : fa105aa64dfb9de314f6d098159ee84376fefeb4
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date : 2026-08-29T17:44:00-03:00
Stats : +31/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/spyder/c/fa105aa64dfb9de314f6d098159ee84376fefeb4?branch=f45
Log:
[PATCH] Remove usage of old private attribute when merging Jupyter
---
diff --git a/spyder-traitlets-merge.patch b/spyder-traitlets-merge.patch
new file mode 100644
index 0000000..e4aab7e
--- /dev/null
+++ b/spyder-traitlets-merge.patch
@@ -0,0 +1,26 @@
+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 dacd709..dd94bee 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -19,6 +19,11 @@ 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
+
BuildArch: noarch
reply other threads:[~2026-08-29 20:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178803629297.1.2121318874181206051.rpms-spyder-fa105aa64dfb@fedoraproject.org \
--to=rosset.filipe@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox