From 2cc070f2c116148b27f5e94897783a054fe97a24 Mon Sep 17 00:00:00 2001 From: Tom Hampson Date: Wed, 15 Nov 2023 16:00:17 +0000 Subject: [PATCH 1/2] Avoid broken version of qtconsole in recipes --- conda/recipes/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/conda_build_config.yaml b/conda/recipes/conda_build_config.yaml index bd7fd7207c96..dd72ca0e7924 100644 --- a/conda/recipes/conda_build_config.yaml +++ b/conda/recipes/conda_build_config.yaml @@ -50,9 +50,9 @@ pyqt: qt_main: - 5.15.8 -# 5.4.2 crashes the jupyter console. The bug was fixed in 5.4.3. +# 5.4.2 crashes the jupyter console. 5.5.0 raises a TypeError when using tab completion. qtconsole: - - '!=5.4.2' + - '!=5.4.2,!=5.5.0' qscintilla2: - 2.13 From ddc49e7367e4bb7d31885ae3f5a00d36352efe6c Mon Sep 17 00:00:00 2001 From: Tom Hampson Date: Wed, 15 Nov 2023 16:04:29 +0000 Subject: [PATCH 2/2] Avoid qt console 5.5.0 in developer files --- mantid-developer-linux.yml | 2 +- mantid-developer-osx.yml | 2 +- mantid-developer-win.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mantid-developer-linux.yml b/mantid-developer-linux.yml index 4c6eeff58db0..1fb0d8576b87 100644 --- a/mantid-developer-linux.yml +++ b/mantid-developer-linux.yml @@ -35,7 +35,7 @@ dependencies: - pyyaml>=5.4.1 - qscintilla2 - qt=5.15.8 # Avoid unexpected qt upgrades - - qtconsole!=5.4.2 # 5.4.2 crashes the jupyter console. Bug was fixed in 5.4.3 + - qtconsole!=5.4.2,!=5.5.0 # 5.4.2 crashes the jupyter console. 5.5.0 raises a TypeError when using tab completion. - qtpy>=1.9.0 - qt-gtk-platformtheme # Use native theme on GTK-based systems, which provides a significantly better performing file browser. - requests>=2.25.1 diff --git a/mantid-developer-osx.yml b/mantid-developer-osx.yml index 8db077808f04..3815cd02c9d1 100644 --- a/mantid-developer-osx.yml +++ b/mantid-developer-osx.yml @@ -35,7 +35,7 @@ dependencies: - pyyaml>=5.4.1 - qscintilla2 - qt=5.15.8 # Avoid unexpected qt upgrades - - qtconsole!=5.4.2 # 5.4.2 crashes the jupyter console. Bug was fixed in 5.4.3 + - qtconsole!=5.4.2,!=5.5.0 # 5.4.2 crashes the jupyter console. 5.5.0 raises a TypeError when using tab completion. - qtpy>=1.9.0 - requests>=2.25.1 - scipy>=1.10.0 diff --git a/mantid-developer-win.yml b/mantid-developer-win.yml index 523d9609923e..8fc27c5132eb 100644 --- a/mantid-developer-win.yml +++ b/mantid-developer-win.yml @@ -35,7 +35,7 @@ dependencies: - pyyaml>=5.4.1 - qscintilla2 - qt=5.15.8 # Avoid unexpected qt upgrades - - qtconsole!=5.4.2 # 5.4.2 crashes the jupyter console. Bug was fixed in 5.4.3 + - qtconsole!=5.4.2,!=5.5.0 # 5.4.2 crashes the jupyter console. 5.5.0 raises a TypeError when using tab completion. - qtpy>=1.9.0 - requests>=2.25.1 - scipy>=1.10.0