Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mne-tools/mne-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.23.1
Choose a base ref
...
head repository: mne-tools/mne-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: maint/0.23
Choose a head ref
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on Aug 26, 2021

  1. BUG: Fix for 3.6

    larsoner committed Aug 26, 2021
    Copy the full SHA
    efb7659 View commit details

Commits on Aug 30, 2021

  1. FIX: One more

    larsoner committed Aug 30, 2021
    Copy the full SHA
    8aba865 View commit details

Commits on Sep 7, 2021

  1. BUG: Fix tolerances

    larsoner committed Sep 7, 2021
    Copy the full SHA
    0daeea6 View commit details
  2. Copy the full SHA
    fe44e95 View commit details

Commits on Sep 9, 2021

  1. MAINT: Bump and release

    larsoner committed Sep 9, 2021
    Copy the full SHA
    b579d32 View commit details
Showing with 35 additions and 4 deletions.
  1. +21 −0 doc/changes/0.23.inc
  2. +2 −0 doc/conf.py
  3. +1 −1 mne/_version.py
  4. +5 −0 mne/fixes.py
  5. +4 −1 mne/io/tests/test_raw.py
  6. +1 −1 mne/tests/test_import_nesting.py
  7. +1 −1 mne/utils/tests/test_numerics.py
21 changes: 21 additions & 0 deletions doc/changes/0.23.inc
Original file line number Diff line number Diff line change
@@ -12,6 +12,27 @@
like this (where xxxx is the pull request number):
- description of enhancement/bugfix/API change (:gh:`xxxx` **by new contributor** |Firstname Lastname|_)

.. _changes_0_23_4:

Version 0.23.4
--------------

- Fix test tolerances for ARM (:gh:`9705` by `Eric Larson`_)

.. _changes_0_23_3:

Version 0.23.3
--------------

- Fix GitHub release diff (by `Eric Larson`_)

.. _changes_0_23_2:

Version 0.23.2
--------------

- Fix bug in shim for ``contextlib.nullcontext`` for Python 3.6 (by `Eric Larson`_)

.. _changes_0_23_1:

Version 0.23.1
2 changes: 2 additions & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
@@ -808,6 +808,8 @@ def reset_warnings(gallery_conf, fname):
'ignore', message="can't resolve package from", category=ImportWarning)
warnings.filterwarnings(
'ignore', message='.*mne-realtime.*', category=DeprecationWarning)
warnings.filterwarnings( # pyvista deprecation
'ignore', message=r'.*Use of .* is deprecated\. Use .* instead.*')


reset_warnings(None, None)
2 changes: 1 addition & 1 deletion mne/_version.py
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@
#
# License: BSD (3-clause)

__version__ = '0.23.1'
__version__ = '0.23.4'
5 changes: 5 additions & 0 deletions mne/fixes.py
Original file line number Diff line number Diff line change
@@ -1080,6 +1080,11 @@ def mean(array, axis):
except ImportError:
from contextlib import contextmanager

@contextmanager
def nullcontext():
yield


def _is_last_row(ax):
try:
return ax.get_subplotspec().is_last_row() # 3.4+
5 changes: 4 additions & 1 deletion mne/io/tests/test_raw.py
Original file line number Diff line number Diff line change
@@ -596,7 +596,10 @@ def test_describe_print():
raw.describe()
s = f.getvalue().strip().split("\n")
assert len(s) == 378
assert s[0] == "<Raw | test_raw.fif, 376 x 14400 (24.0 s), ~3.3 MB, data not loaded>" # noqa
# Can be 3.1, 3.3, etc.
assert re.match(
r'<Raw | test_raw.fif, 376 x 14400 (24\.0 s), '
r'~3\.. MB, data not loaded>', s[0]) is not None, s[0]
assert s[1] == " ch name type unit min Q1 median Q3 max" # noqa
assert s[2] == " 0 MEG 0113 GRAD fT/cm -221.80 -38.57 -9.64 19.29 414.67" # noqa
assert s[-1] == "375 EOG 061 EOG µV -231.41 271.28 277.16 285.66 334.69" # noqa
2 changes: 1 addition & 1 deletion mne/tests/test_import_nesting.py
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
# check scipy (Numba imports it to check the version)
ok_scipy_submodules = set(['scipy', 'numpy', # these appear in old scipy
'version'])
'version', 'sparse', 'misc'])
scipy_submodules = set(x.split('.')[1] for x in sys.modules.keys()
if x.startswith('scipy.') and '__' not in x and
not x.split('.')[1].startswith('_')
2 changes: 1 addition & 1 deletion mne/utils/tests/test_numerics.py
Original file line number Diff line number Diff line change
@@ -297,7 +297,7 @@ def test_object_size():
(0, 150, np.ones(0)),
(0, 150, np.int32(1)),
(150, 500, np.ones(20)),
(50, 400, dict()),
(30, 400, dict()),
(400, 1000, dict(a=np.ones(50))),
(200, 900, sparse.eye(20, format='csc')),
(200, 900, sparse.eye(20, format='csr'))):