Merge from 5.x: PR #21939

spyder-ide · Mar 30, 2024 · 4b34f79 · 4b34f79
2 parents 5ce3ab5 + d91fb55
commit 4b34f79
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -40,7 +40,7 @@ dependencies:
 - pyzmq >=24.0.0
 - qdarkstyle >=3.2.0,<3.3.0
 - qstylizer >=0.2.2
-- qtawesome >=1.3.0
+- qtawesome >=1.3.1,<1.4.0
 - qtconsole >=5.5.1,<5.6.0
 - qtpy >=2.4.0
 - rtree >=0.9.7

diff --git a/installers-conda/build-environment.yml b/installers-conda/build-environment.yml
@@ -2,7 +2,7 @@ name: spy-inst
 channels:
   - conda-forge
 dependencies:
-  - boa
+  - boa <0.17.0  # See https://github.com/conda-forge/boa-feedstock/issues/81
   - conda >=23.11.0
   - conda-standalone >=23.11.0
   - constructor >=3.6.0

diff --git a/requirements/main.yml b/requirements/main.yml
@@ -36,7 +36,7 @@ dependencies:
   - pyzmq >=24.0.0
   - qdarkstyle >=3.2.0,<3.3.0
   - qstylizer >=0.2.2
-  - qtawesome >=1.3.0
+  - qtawesome >=1.3.1,<1.4.0
   - qtconsole >=5.5.1,<5.6.0
   - qtpy >=2.4.0
   - rtree >=0.9.7

diff --git 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.3.0',
+    'qtawesome>=1.3.1,<1.4.0',
     'qtconsole>=5.5.1,<5.6.0',
     'qtpy>=2.4.0',
     'rtree>=0.9.7',

diff --git a/spyder/dependencies.py b/spyder/dependencies.py
@@ -64,7 +64,7 @@
 PYZMQ_REQVER = '>=24.0.0'
 QDARKSTYLE_REQVER = '>=3.2.0,<3.3.0'
 QSTYLIZER_REQVER = '>=0.2.2'
-QTAWESOME_REQVER = '>=1.3.0'
+QTAWESOME_REQVER = '>=1.3.1,<1.4.0'
 QTCONSOLE_REQVER = '>=5.5.1,<5.6.0'
 QTPY_REQVER = '>=2.4.0'
 RTREE_REQVER = '>=0.9.7'