Skip to content

Commit

Permalink
Update spyder to version 5.5.3 / rev 52 via SR 1163542
Browse files Browse the repository at this point in the history
https://build.opensuse.org/request/show/1163542
by user bnavigator + anag+factory
- Update to 5.5.3
  * Fix critical error when starting IPython console kernels on
    macOS and Linux in conda environments.
- Release 5.5.2
  * Activate environment for consoles that run in the same
    environment as Spyder.
  * Fix IPython kernel hangs when using a different graphic backend
    than Inline.
  * Fix check for updates mechanism when running Spyder from a
    conda installation.
- Add spyder-pr21939-qtawesome1.3.patch gh#spyder-ide/spyder#21939
  but also allow 1.2
- Add spyder-pr21942-pylint3.1.patch gh#spyder-ide/spyder#21942
  • Loading branch information
bnavigator authored and bmwiedemann committed Apr 2, 2024
1 parent 2cea4e8 commit 44ddf4f
Show file tree
Hide file tree
Showing 8 changed files with 180 additions and 10 deletions.
Binary file modified packages/s/spyder/.files
Binary file not shown.
21 changes: 21 additions & 0 deletions packages/s/spyder/.rev
Original file line number Diff line number Diff line change
Expand Up @@ -684,4 +684,25 @@ rename the package from spyder3 to spyder.
<comment></comment>
<requestid>1154298</requestid>
</revision>
<revision rev="52" vrev="1">
<srcmd5>92abab51f9596c30b988eec230c71b7f</srcmd5>
<version>5.5.3</version>
<time>1712068818</time>
<user>anag+factory</user>
<comment>- Update to 5.5.3
* Fix critical error when starting IPython console kernels on
macOS and Linux in conda environments.
- Release 5.5.2
* Activate environment for consoles that run in the same
environment as Spyder.
* Fix IPython kernel hangs when using a different graphic backend
than Inline.
* Fix check for updates mechanism when running Spyder from a
conda installation.
- Add spyder-pr21939-qtawesome1.3.patch gh#spyder-ide/spyder#21939
but also allow 1.2
- Add spyder-pr21942-pylint3.1.patch gh#spyder-ide/spyder#21942
</comment>
<requestid>1163542</requestid>
</revision>
</revisionlist>
1 change: 0 additions & 1 deletion packages/s/spyder/spyder-5.5.1.tar.gz

This file was deleted.

1 change: 1 addition & 0 deletions packages/s/spyder/spyder-5.5.3.tar.gz
64 changes: 64 additions & 0 deletions packages/s/spyder/spyder-pr21939-qtawesome1.3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
From 7b046831a82309bc532debd45dc35769879c1381 Mon Sep 17 00:00:00 2001
From: dalthviz <[email protected]>
Date: Wed, 27 Mar 2024 18:02:03 -0500
Subject: [PATCH] Update qtawesome version

---
binder/environment.yml | 2 +-
requirements/main.yml | 2 +-
setup.py | 2 +-
spyder/dependencies.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/binder/environment.yml b/binder/environment.yml
index 1ec4b5d3a64..efd76176a35 100644
--- a/binder/environment.yml
+++ b/binder/environment.yml
@@ -36,7 +36,7 @@ dependencies:
- pyzmq >=24.0.0
- qdarkstyle >=3.2.0,<3.3.0
- qstylizer >=0.2.2
-- qtawesome >=1.2.1,<1.3.0
+- qtawesome >=1.2.1,<1.4.0
- qtconsole >=5.5.1,<5.6.0
- qtpy >=2.1.0
- rtree >=0.9.7
diff --git a/requirements/main.yml b/requirements/main.yml
index 96d80b57e53..6c12ffb3395 100644
--- a/requirements/main.yml
+++ b/requirements/main.yml
@@ -33,7 +33,7 @@ dependencies:
- pyzmq >=24.0.0
- qdarkstyle >=3.2.0,<3.3.0
- qstylizer >=0.2.2
- - qtawesome >=1.2.1,<1.3.0
+ - qtawesome >=1.2.1,<1.4.0
- qtconsole >=5.5.1,<5.6.0
- qtpy >=2.1.0
- rtree >=0.9.7
diff --git a/setup.py b/setup.py
index 7af75bfb9a1..a0ccb82b4df 100644
--- a/setup.py
+++ b/setup.py
@@ -237,7 +237,7 @@ def run(self):
'pyzmq>=24.0.0',
'qdarkstyle>=3.2.0,<3.3.0',
'qstylizer>=0.2.2',
- 'qtawesome>=1.2.1,<1.3.0',
+ 'qtawesome>=1.2.1,<1.4.0',
'qtconsole>=5.5.1,<5.6.0',
'qtpy>=2.1.0',
'rtree>=0.9.7',
diff --git a/spyder/dependencies.py b/spyder/dependencies.py
index e1d12f7460d..e56f05f7770 100644
--- a/spyder/dependencies.py
+++ b/spyder/dependencies.py
@@ -65,7 +65,7 @@
PYZMQ_REQVER = '>=24.0.0'
QDARKSTYLE_REQVER = '>=3.2.0,<3.3.0'
QSTYLIZER_REQVER = '>=0.2.2'
-QTAWESOME_REQVER = '>=1.2.1,<1.3.0'
+QTAWESOME_REQVER = '>=1.2.1,<1.4.0'
QTCONSOLE_REQVER = '>=5.5.1,<5.6.0'
QTPY_REQVER = '>=2.1.0'
RTREE_REQVER = '>=0.9.7'
64 changes: 64 additions & 0 deletions packages/s/spyder/spyder-pr21942-pylint3.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
From e38a6b11fe0adf63864696167ddeff7b25778d92 Mon Sep 17 00:00:00 2001
From: Ben Greiner <[email protected]>
Date: Fri, 29 Mar 2024 11:21:43 +0100
Subject: [PATCH] Bump pylint to >3.1,<4

---
binder/environment.yml | 2 +-
requirements/main.yml | 2 +-
setup.py | 2 +-
spyder/dependencies.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/binder/environment.yml b/binder/environment.yml
index 1ec4b5d3a64..9abda78b98f 100644
--- a/binder/environment.yml
+++ b/binder/environment.yml
@@ -25,7 +25,7 @@ dependencies:
- pickleshare >=0.4
- psutil >=5.3
- pygments >=2.0
-- pylint >=2.5.0,<3.1
+- pylint >=3.1,<4
- pylint-venv >=3.0.2
- pyls-spyder >=0.4.0
- pyqt >=5.10,<5.16
diff --git a/requirements/main.yml b/requirements/main.yml
index 96d80b57e53..d3d2abd9ac7 100644
--- a/requirements/main.yml
+++ b/requirements/main.yml
@@ -23,7 +23,7 @@ dependencies:
- pickleshare >=0.4
- psutil >=5.3
- pygments >=2.0
- - pylint >=2.5.0,<3.1
+ - pylint >=3.1,<4
- pylint-venv >=3.0.2
- pyls-spyder >=0.4.0
- pyqt >=5.10,<5.16
diff --git a/setup.py b/setup.py
index 7af75bfb9a1..b79cfae5b0e 100644
--- a/setup.py
+++ b/setup.py
@@ -226,7 +226,7 @@ def run(self):
'pickleshare>=0.4',
'psutil>=5.3',
'pygments>=2.0',
- 'pylint>=2.5.0,<3.1',
+ 'pylint>=3.1,<4',
'pylint-venv>=3.0.2',
'python-lsp-black>=2.0.0,<3.0.0',
'pyls-spyder>=0.4.0',
diff --git a/spyder/dependencies.py b/spyder/dependencies.py
index e1d12f7460d..a5d2440cc20 100644
--- a/spyder/dependencies.py
+++ b/spyder/dependencies.py
@@ -56,7 +56,7 @@
PICKLESHARE_REQVER = '>=0.4'
PSUTIL_REQVER = '>=5.3'
PYGMENTS_REQVER = '>=2.0'
-PYLINT_REQVER = '>=2.5.0,<3.1'
+PYLINT_REQVER = '>=3.1,<4'
PYLINT_VENV_REQVER = '>=3.0.2'
PYLSP_REQVER = '>=1.10.0,<1.11.0'
PYLSP_BLACK_REQVER = '>=2.0.0,<3.0.0'
17 changes: 17 additions & 0 deletions packages/s/spyder/spyder.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Mar 18 19:22:23 UTC 2024 - Ben Greiner <[email protected]>

- Update to 5.5.3
* Fix critical error when starting IPython console kernels on
macOS and Linux in conda environments.
- Release 5.5.2
* Activate environment for consoles that run in the same
environment as Spyder.
* Fix IPython kernel hangs when using a different graphic backend
than Inline.
* Fix check for updates mechanism when running Spyder from a
conda installation.
- Add spyder-pr21939-qtawesome1.3.patch gh#spyder-ide/spyder#21939
but also allow 1.2
- Add spyder-pr21942-pylint3.1.patch gh#spyder-ide/spyder#21942

-------------------------------------------------------------------
Sat Mar 2 10:26:04 UTC 2024 - Ben Greiner <[email protected]>

Expand Down
22 changes: 13 additions & 9 deletions packages/s/spyder/spyder.spec
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,18 @@
# your live system before submitting an update.
%bcond_with test
Name: spyder
Version: 5.5.1
Version: 5.5.3
Release: 0
Summary: The Scientific Python Development Environment
License: MIT
Group: Development/Languages/Python
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-pr21939-qtawesome1.3.patch gh#spyder-ide/spyder#21939
Patch1: spyder-pr21939-qtawesome1.3.patch
# PATCH-FIX-UPSTREAM spyder-pr21942-pylint3.1.patch gh#spyder-ide/spyder#21942
Patch2: spyder-pr21942-pylint3.1.patch
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python3-base >= 3.7
Expand All @@ -39,7 +43,6 @@ BuildRequires: update-desktop-files
Requires: %{name}-lang
Requires: cookiecutter >= 1.6.0
Requires: python3-Pygments >= 2.0
Requires: python3-QtAwesome >= 1.2.1
Requires: python3-QtPy >= 2.1.0
Requires: python3-Rtree >= 0.9.7
Requires: python3-Sphinx >= 0.6.6
Expand All @@ -66,7 +69,7 @@ Requires: python3-pyflakes >= 2.2.0
Requires: python3-pylint-venv >= 3.0.2
Requires: python3-pyls-spyder >= 0.4.0
Requires: python3-pyxdg >= 0.26
Requires: python3-pyzmq >= 22.1.0
Requires: python3-pyzmq >= 24
Requires: python3-qstylizer >= 0.2.2
Requires: python3-qt5 >= 5.10
Requires: python3-qtwebengine-qt5 >= 5.10
Expand All @@ -78,13 +81,14 @@ Requires: python3-watchdog
Requires: python3-whatthepatch
Requires: python3-yapf
Requires: (python3-QDarkStyle >= 3.2.0 with python3-QDarkStyle < 3.3.0)
Requires: (python3-QtAwesome >= 1.2.1 with python3-QtAwesome < 1.4)
Requires: (python3-ipython >= 8.13 with python3-ipython < 9)
Requires: (python3-jedi >= 0.17.2 with python3-jedi < 0.20)
Requires: (python3-pylint >= 2.5.0 with python3-pylint < 3.1)
Requires: (python3-pylint >= 3.1 with python3-pylint < 4)
Requires: (python3-python-lsp-black >= 2.0.0 with python3-python-lsp-black < 3)
Requires: (python3-python-lsp-server >= 1.10.0 with python3-python-lsp-server < 1.11)
Requires: (python3-qtconsole >= 5.5.1 with python3-qtconsole < 5.6.0)
Requires: (python3-spyder-kernels >= 2.5 with python3-spyder-kernels < 2.6)
Requires: (python3-spyder-kernels >= 2.5.1 with python3-spyder-kernels < 2.6)
Recommends: %{name}-dicom
Recommends: %{name}-hdf5
Recommends: python3-Cython >= 0.21
Expand Down Expand Up @@ -118,7 +122,6 @@ BuildRequires: git-core
BuildRequires: python3-Cython >= 0.21
BuildRequires: python3-Pillow
BuildRequires: python3-Pygments >= 2.0
BuildRequires: python3-QtAwesome >= 1.2.1
BuildRequires: python3-QtPy >= 2.1.0
BuildRequires: python3-Rtree >= 0.9.7
BuildRequires: python3-Sphinx >= 0.6.6
Expand Down Expand Up @@ -158,7 +161,7 @@ BuildRequires: python3-pytest-order
BuildRequires: python3-pytest-qt
BuildRequires: python3-pytest-timeout
BuildRequires: python3-pyxdg >= 0.26
BuildRequires: python3-pyzmq >= 22.1.0
BuildRequires: python3-pyzmq >= 24
BuildRequires: python3-qstylizer >= 0.2.2
BuildRequires: python3-qt5 >= 5.10
BuildRequires: python3-qtwebengine-qt5 >= 5.10
Expand All @@ -173,13 +176,14 @@ BuildRequires: python3-yapf
BuildRequires: xdpyinfo
BuildRequires: xvfb-run
BuildRequires: (python3-QDarkStyle >= 3.2 with python3-QDarkStyle < 3.3)
BuildRequires: (python3-QtAwesome >= 1.2.1 with python3-QtAwesome < 1.4)
BuildRequires: (python3-ipython >= 8.13 with python3-ipython < 9)
BuildRequires: (python3-jedi >= 0.17.2 with python3-jedi < 0.20)
BuildRequires: (python3-pylint >= 2.5.0 with python3-pylint < 3.1)
BuildRequires: (python3-pylint >= 3.1 with python3-pylint < 4)
BuildRequires: (python3-python-lsp-black >= 2.0.0 with python3-python-lsp-black < 3)
BuildRequires: (python3-python-lsp-server >= 1.10 with python3-python-lsp-server < 1.11)
BuildRequires: (python3-qtconsole >= 5.5.1 with python3-qtconsole < 5.6)
BuildRequires: (python3-spyder-kernels >= 2.5 with python3-spyder-kernels < 2.6)
BuildRequires: (python3-spyder-kernels >= 2.5.1 with python3-spyder-kernels < 2.6)
# /SECTION

%description
Expand Down

0 comments on commit 44ddf4f

Please sign in to comment.