Merge from 5.x: PR #15178

Fixes #15176
spyder-ide · Apr 7, 2021 · cdfed5a · cdfed5a
2 parents ef2dc9b + 8228c7c
commit cdfed5a
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 >=17
 - qdarkstyle =3.0.2
 - qstylizer >=0.1.10
-- qtawesome >=0.5.7
+- qtawesome >=1.0.2
 - qtconsole >=5.0.3
 - qtpy >=1.5.0
 - rtree >=0.8.3

diff --git a/requirements/conda.txt b/requirements/conda.txt
@@ -32,7 +32,7 @@ pyxdg >=0.26
 pyzmq >=17
 qdarkstyle =3.0.2
 qstylizer >=0.1.10
-qtawesome >=0.5.7
+qtawesome >=1.0.2
 qtconsole >=5.0.3
 qtpy >=1.5.0
 rtree >=0.8.3

diff --git a/setup.py b/setup.py
@@ -231,7 +231,7 @@ def run(self):
     'pyzmq>=17',
     'qdarkstyle==3.0.2',
     'qstylizer>=0.1.10',
-    'qtawesome>=0.5.7',
+    'qtawesome>=1.0.2',
     'qtconsole>=5.0.3',
     'qtpy>=1.5.0',
     'setuptools>=39.0.0',

diff --git a/spyder/dependencies.py b/spyder/dependencies.py
@@ -57,7 +57,7 @@
 PYZMQ_REQVER = '>=17'
 QDARKSTYLE_REQVER = '=3.0.2'
 QSTYLIZER_REQVER = '>=0.1.10'
-QTAWESOME_REQVER = '>=0.5.7'
+QTAWESOME_REQVER = '>=1.0.2'
 QTCONSOLE_REQVER = '>=5.0.3'
 QTPY_REQVER = '>=1.5.0'
 RTREE_REQVER = '>=0.8.3'