Merge from 5.x: PR #19922

Fixes #18642
spyder-ide · Oct 24, 2022 · 0d6db54 · 0d6db54
2 parents e710df8 + 6b21184
commit 0d6db54
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -36,7 +36,7 @@ dependencies:
 - pyzmq >=22.1.0
 - qdarkstyle >=3.0.2,<3.1.0
 - qstylizer >=0.2.2
-- qtawesome >=1.0.2
+- qtawesome >=1.2.1
 - qtconsole >=5.3.2,<5.4.0
 - qtpy >=2.1.0
 - rtree >=0.9.7

diff --git a/requirements/main.yml b/requirements/main.yml
@@ -33,7 +33,7 @@ dependencies:
   - pyzmq >=22.1.0
   - qdarkstyle >=3.0.2,<3.1.0
   - qstylizer >=0.2.2
-  - qtawesome >=1.0.2
+  - qtawesome >=1.2.1
   - qtconsole >=5.3.2,<5.4.0
   - qtpy >=2.1.0
   - rtree >=0.9.7

diff --git a/setup.py b/setup.py
@@ -234,7 +234,7 @@ def run(self):
     'pyzmq>=22.1.0',
     'qdarkstyle>=3.0.2,<3.1.0',
     'qstylizer>=0.2.2',
-    'qtawesome>=1.0.2',
+    'qtawesome>=1.2.1',
     'qtconsole>=5.3.2,<5.4.0',
     'qtpy>=2.1.0',
     'rtree>=0.9.7',

diff --git a/spyder/dependencies.py b/spyder/dependencies.py
@@ -60,7 +60,7 @@
 PYZMQ_REQVER = '>=22.1.0'
 QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0'
 QSTYLIZER_REQVER = '>=0.2.2'
-QTAWESOME_REQVER = '>=1.0.2'
+QTAWESOME_REQVER = '>=1.2.1'
 QTCONSOLE_REQVER = '>=5.3.2;<5.4.0'
 QTPY_REQVER = '>=2.1.0'
 RTREE_REQVER = '>=0.9.7'