Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use native file browsers on GTK-based linux environments #35482

Merged
merged 10 commits into from
May 4, 2023
Merged

Use native file browsers on GTK-based linux environments #35482

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e9ac58d
Change qt pinning to 5.15.8
jhaigh0 Mar 23, 2023
72e7168
Remove poco pinning in developer files
thomashampson Mar 23, 2023
5972b67
Remove openssl pinning
thomashampson Mar 23, 2023
dc735b0
Workaround for matplotlib/qt bug for qt>=5.15.6
thomashampson Apr 4, 2023
ff78be4
Remove old depreceated unused includes
thomashampson Apr 4, 2023
4b8dbfd
Restrict Poco version due to Windows compiler warning
thomashampson Apr 4, 2023
e500f2a
Use native file browsers on Linux.
thomashampson Apr 6, 2023
35bcddf
Remove occt pinning from developer env and conda recipes
thomashampson Apr 14, 2023
0f407c1
Merge branch 'main' into 34820_IDAaaS_native_file_browser
thomashampson Apr 26, 2023
03cf1fb
Add comment for qt-gtk-platformtheme package
thomashampson May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions conda/recipes/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ tbb:
hdf5:
- 1.12.*

occt:
- 7.5

gsl:
- 2.7

Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/mantid/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ requirements:
- muparser
- nexus
- numpy {{ numpy }}
- occt {{ occt }}
- occt
- python {{ python }}
- poco {{ poco }}
- setuptools {{ setuptools }}
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/mantidqt/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ requirements:
- {{ pin_compatible("qt-main", upper_bound="5.15.9") }}
- qtpy
- python
- qt-gtk-platformtheme # [linux]

test:
imports:
Expand Down
1 change: 1 addition & 0 deletions docs/source/release/v6.7.0/Workbench/Bugfixes/34820.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Restore native file browser dialogs on Linux. This will fix problems with the file browser freezing and crashing on IDAaaS.
3 changes: 2 additions & 1 deletion mantid-developer-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- nexus=4.4.*
- ninja>=1.10.2
- numpy<=1.23
- occt>=7.4.0
- occt
- pip>=21.0.1
- poco=1.12.1|>=1.12.5 # 1.12.2 introduced an unguarded #define NOMINMAX which causes a compiler warning. It's resolved on their devel branch so should be fine after 1.12.4
- psutil>=5.8.0
Expand All @@ -37,6 +37,7 @@ dependencies:
- qt=5.15.8 # Avoid unexpected qt upgrades
- qtconsole=5.4.1 # 5.4.2 crashes the jupyter console
- qtpy>=1.9.0
- qt-gtk-platformtheme
- requests>=2.25.1
- scipy>=1.6.2
- setuptools=47.0.0 # Pinned purposefully due to incompatibility with later versions
Expand Down
2 changes: 1 addition & 1 deletion mantid-developer-win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies:
- nexus=4.4.*
- ninja>=1.10.2
- numpy<=1.23
- occt>=7.4.0
- occt
- conda-wrappers
- pip>=21.0.1
- poco=1.12.1|>=1.12.5 # 1.12.2 introduced an unguarded #define NOMINMAX which causes a compiler warning. It's resolved on their devel branch so should be fine after 1.12.4
Expand Down