Skip to content

Conversation

@hoechenberger
Copy link
Member

No description provided.

@hoechenberger hoechenberger marked this pull request as draft November 8, 2021 17:04
@hoechenberger
Copy link
Member Author

Whoops, that was a bit too much. Will fix.

@hoechenberger
Copy link
Member Author

Needs adjustment to doc/conf.py before it can be merged:
#9972 (comment)

@larsoner larsoner mentioned this pull request Nov 8, 2021
mscheltienne and others added 3 commits November 9, 2021 10:23
…ve. (mne-tools#9975)

* Add argument overwrite to export for Raws.

* Add argument overwrite to export for epochs.

* Add tests.

* Add entry to changelog.

* Move entry to changelog to Bugs and fix spelling typo.

* fix indentation for ..versionadded

* typo fix.

* fix tests.

* Change versionadded from 1.0 to 0.24.1 [skip azp] [skip actions]

* Add overwrite for evoked instances (mffpy related).

* FIX: replace else statement with finally.

* Use shutil.rmtree instead of os.remove since mffpy creates a directory.

* Remove finally.

* Update changelog.

* improve comment preceding folder deletion.

* Update mne/epochs.py [skip ci]

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

* Update mne/export/_egimff.py [skip ci]

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

* Update mne/export/_export.py [skip ci]

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

* Update mne/export/_export.py [skip ci]

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

* Update mne/export/_export.py [skip ci]

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

* Update mne/export/_egimff.py

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

* Fix behavior when pathlib.Path are passed instead of strings.

* Fix import and style.

* add test for epochs as well.

* Remove str(fname) as it's not needed.

* fix positional/keyword arguments.

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
@larsoner larsoner marked this pull request as ready for review November 9, 2021 15:25
@larsoner larsoner requested a review from sappelhoff as a code owner November 9, 2021 15:25
* import fix for scipy 1.8 pre

* fix arg oversight

* FIX: A couple more

* FIX: Found another

* FIX: More [skip azp] [skip circle]

* FIX: Correct [skip circle] [skip azp]

* FIX: One more

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

larsoner commented Nov 9, 2021

I added #9973, #9979, #9975, updated doc/conf.py, and marked as ready. Will merge once CIs come back happy

@hoechenberger
Copy link
Member Author

Nice, thanks, @larsoner!

@larsoner larsoner merged commit d995aa2 into mne-tools:maint/0.24 Nov 9, 2021
@hoechenberger hoechenberger deleted the backport-9972 branch November 9, 2021 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants