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.

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

[ENH, MRG] Add object-oriented widget abstraction #10913

Merged
merged 29 commits into from
Aug 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7607789
Add object-oriented widget abstraction
alexrockhill Jul 8, 2022
c6cd1ba
fix docstyle
alexrockhill Jul 8, 2022
321d36e
fix test
alexrockhill Jul 8, 2022
e610bff
fix tests, synchronize tests between backends
alexrockhill Jul 9, 2022
ec79462
another try at fixing tests
alexrockhill Jul 9, 2022
fefc541
try without qwidget init
alexrockhill Jul 9, 2022
b22bfcb
last fix hopefully
alexrockhill Jul 9, 2022
cfc5b82
fix require ipympl
alexrockhill Jul 9, 2022
2bb2c81
fix server yml
alexrockhill Jul 9, 2022
a681195
hopefully fix last test, add renderer test
alexrockhill Jul 9, 2022
3d681b4
fix note for future fake keypress
alexrockhill Jul 9, 2022
ccf9d50
cruft
alexrockhill Jul 10, 2022
6e4fd63
rerun tests
alexrockhill Jul 12, 2022
eb6be0c
WIP: Try to fix CIs
larsoner Jul 13, 2022
5c3560e
FIX: Name
larsoner Jul 13, 2022
5f66865
FIX: Workaround
larsoner Jul 14, 2022
f112ca1
FIX: Two more
larsoner Jul 14, 2022
9b42028
FIX: One more
larsoner Jul 14, 2022
afe0108
rerun CIs
alexrockhill Jul 18, 2022
3d4f273
add skip test
alexrockhill Jul 19, 2022
5fae518
fix skip
alexrockhill Jul 19, 2022
f38d080
rollback in CIs
alexrockhill Jul 22, 2022
7fa2c0d
suppress pyvista point error for now
alexrockhill Jul 22, 2022
609d348
fix suppress error in conftest
alexrockhill Jul 22, 2022
6e1c6e5
fix tests
alexrockhill Jul 22, 2022
1a0b248
better way to patch close all
alexrockhill Jul 22, 2022
db7a90a
add ipympl to environment
alexrockhill Jul 25, 2022
9c229ea
remove ipympl dependency on Windows
alexrockhill Jul 28, 2022
4e83012
eric comment
alexrockhill Jul 28, 2022
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
5 changes: 5 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,11 @@ stages:
- script: conda env update --name base --file environment.yml
condition: eq(variables['TEST_MODE'], 'conda')
displayName: Setup MNE environment
# ipympl is not tested on Windows and even its installation interferes
# with basic matplotlib functionality so it must be uninstalled until fixed
- script: conda uninstall -y ipympl
condition: eq(variables['TEST_MODE'], 'conda')
displayName: Remove ipympl
- bash: |
set -e
conda remove -c conda-forge --force -yq mne
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ dependencies:
- mne
- mffpy>=0.5.7
- ipywidgets
- ipympl
- ipyvtklink
- mne-qt-browser
- pymatreader
Expand Down
4 changes: 4 additions & 0 deletions mne/viz/_brain/tests/test_brain.py
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,10 @@ def test_brain_traces(renderer_interactive_pyvistaqt, hemi, src, tmp_path,
assert img.shape[:2] == screenshot_all.shape[:2]


# TODO: don't skip on Windows, see
# https://github.com/mne-tools/mne-python/pull/10935
# for some reason there is a dependency issue with ipympl even using pyvista
@pytest.mark.skipif(sys.platform == 'win32', reason='ipympl issue on Windows')
@testing.requires_testing_data
def test_brain_scraper(renderer_interactive_pyvistaqt, brain_gc, tmp_path):
"""Test a simple scraping example."""
Expand Down
Loading