Skip to content

ENH: collapse Jupyter Notebook html representations #9255

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

Jump to bottom
Closed
vagechirkov wants to merge 16 commits into from
Closed

ENH: collapse Jupyter Notebook html representations #9255

vagechirkov wants to merge 16 commits into from

Conversation

@vagechirkov
Copy link
Contributor

@vagechirkov vagechirkov commented Apr 6, 2021 •
edited
Loading

Reference issues: #9249 #9177

Collapsed sections:

Details

image

Expand sections:

Details

image

@drammock
Copy link
Member

drammock commented Apr 6, 2021

For the last day or so, Circle CI was not properly rendering changed tutorials. It should be fixed now; can you merge current main into this PR (or rebase against main) to see if it actually executes the "reports" tutorial, so we can see this in-situ?

drammock and others added 7 commits April 7, 2021 00:46
@drammock @larsoner
expose colorbar label parameter in plot_sensors_connectivity (mne-too…
a692682 
…ls#9248)

* expose cbar label param; update test

* update changelog

* Update mne/viz/_3d.py

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>

* fix error message grammar

* Update mne/viz/tests/test_3d.py

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
@drammock
fix: error when passing axes to plot_compare_evokeds (mne-tools#9252)
e17a82d 
* fix comparing array to string

* update changelog

* fix: prev changelog entry in wrong place
@drammock
fix for MPL 3.4.x (mne-tools#9253)
329eafe
@drammock @larsoner
Fix html table scrolling again (mne-tools#9254)
eeb550d 
* remove cruft

* fix dataframe x-scrolling for latest docutils [skip azp][skip github]

* touch tutorial [skip github][skip azp]

* fix acronyms in BibTeX

* remove month fields

* remove keyword fields

* whitespace

* cruft

* remove language fields

* touch tutorial again (why?)

* FIX: Cats

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
@larsoner @GuillaumeFavelier
MRG, MAINT: Better notebook tests (mne-tools#9034)
338ef60 
* MAINT: Encapsulate and separate notebook tests

* FIX: Fixture

* MAINT: ipytest requirement

* ENH: Add

* WIP: Closer-ish

* FIX

* FIX: Scope?

* Fix conftest

* TST: Skip Windows

Co-authored-by: Guillaume Favelier <guillaume.favelier@gmail.com>
@larsoner
BUG: Fix coordinate frame (mne-tools#9251)
7070a60 
* BUG: Fix coordinate frame

* FIX: Better test

* FIX: Test
@eioe @britta-wstnr @drammock
ENH: add to_data_frame method to EpochsTFR (mne-tools#9124)
880fbdf 
* implement to_df method; missing selection attr

* add to_data_frame method

* Apply suggestions from code review

Co-authored-by: Britta Westner <britta.wstnr@gmail.com>

* cosmetics

* add test_to_data_frame

* fix tests _index and _time_format

* fix codespell

* fix codespell (I now learned to run flake locally)

* add selection, drop_log to EpochsTFR

* forward selection and drop_log to EpochsTFR

* assign selection and drop_log also in else case

* consistency checks

* add tests for selection, drop_log, rw epochstfr

* doc: add EpochsTFR to params of read_ write_tfrs

* add doc string for test_init_EpochsTFR

* fix doc str test

* move to_data_frame to _BaseTFR for inheritance

* extend tests

* simplify

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* upgrade coding style

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* shorten doc string

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* shorten doc string

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* Apply suggestions from code review

Co-authored-by: eioe <klotzsche@cbs.mpg.de>

Co-authored-by: Britta Westner <britta.wstnr@gmail.com>
Co-authored-by: Daniel McCloy <dan@mccloy.info>
@vagechirkov
Copy link
Contributor Author

vagechirkov commented Apr 6, 2021

merge current main into this PR

I am using this command:

>> git pull --rebase

Is it the correct way to rebase?

@vagechirkov
Copy link
Contributor Author

vagechirkov commented Apr 6, 2021

I have also added for Circle CI rendering the tutorial plot_20_events_from_raw.py from issue #9249.

@drammock
Copy link
Member

drammock commented Apr 7, 2021

merge current main into this PR

I am using this command:

>> git pull --rebase

Is it the correct way to rebase?

There are a few different ways to do it. Assuming you're on the collapsible-repr-html branch already, you can do

git fetch upstream
git rebase upstream/main

or you can do

git pull --rebase upstream/main

For the purposes of MNE-Python development, this is also fine: git pull upstream/main or git fetch upstream; git merge upstream/main. The reason it doesn't matter whether you rebase or merge is that when we merge PRs we squash all the PR commits into one commit, so the diff between main and this branch will end up looking the same either way.

@vagechirkov
Copy link
Contributor Author

vagechirkov commented Apr 7, 2021

merge current main into this PR

I am using this command:

>> git pull --rebase

Is it the correct way to rebase?

There are a few different ways to do it. Assuming you're on the collapsible-repr-html branch already, you can do

git fetch upstream
git rebase upstream/main

or you can do

git pull --rebase upstream/main

For the purposes of MNE-Python development, this is also fine: git pull upstream/main or git fetch upstream; git merge upstream/main. The reason it doesn't matter whether you rebase or merge is that when we merge PRs we squash all the PR commits into one commit, so the diff between main and this branch will end up looking the same either way.

Thank you very much for the explanation!

@vagechirkov vagechirkov marked this pull request as ready for review April 7, 2021 20:15
@vagechirkov vagechirkov changed the title WIP ENH: collapse too long Jupyter Notebook representations ENH: collapse Jupyter Notebook html representations Apr 7, 2021
@hoechenberger
Copy link
Member

hoechenberger commented Apr 8, 2021

Sorry for not getting back to you, @vagechirkov. I will have time to take a closer look at this hopefully tonight!

@vagechirkov
Copy link
Contributor Author

vagechirkov commented Apr 8, 2021

For me personally, it seems convenient to have HTML representations with an option to collapse sections. But this is probably more related to issue #9177 than #9249.

@larsoner larsoner added this to the 1.6 milestone Oct 1, 2023
@drammock drammock mentioned this pull request Oct 3, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@drammock drammock

Labels

None yet

Projects

None yet

Milestone

1.6

Development

Successfully merging this pull request may close these issues.

5 participants

@vagechirkov @drammock @hoechenberger @larsoner @eioe