Skip to content

Commit

Permalink
Merge pull request #36416 from mantidproject/avoid_qtconsole_5_5_0
Browse files Browse the repository at this point in the history
Avoid qtconsole 5.5.0
  • Loading branch information
AndreiSavici authored Nov 15, 2023
2 parents 641349b + ddc49e7 commit 13cfff1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions conda/recipes/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mantid-developer-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mantid-developer-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mantid-developer-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 13cfff1

Please sign in to comment.