Merge remote-tracking branch 'upstream/main' into patch-3

* upstream/main:
  MRG: Add "verbose" parameter to pick_channels() method (mne-tools#10544)
  CI: Avoid bad PySide6 (mne-tools#10545)
  FIX: Flake (mne-tools#10540)

Author: larsoner

azure-pipelines.yml

@@ -110,7 +110,7 @@ stages:
     - bash: |
         set -e
         python -m pip install --progress-bar off --upgrade pip setuptools wheel codecov
-        python -m pip install --progress-bar off mne-qt-browser[opengl] vtk scikit-learn pytest-error-for-skips python-picard PySide6 qtpy
+        python -m pip install --progress-bar off mne-qt-browser[opengl] vtk scikit-learn pytest-error-for-skips python-picard "PySide6!=6.3.0" qtpy
         python -m pip uninstall -yq mne
         python -m pip install --progress-bar off --upgrade -e .[test]
       displayName: 'Install dependencies with pip'

doc/changes/latest.inc

@@ -25,6 +25,8 @@ Enhancements
 ~~~~~~~~~~~~
 - Add support for ``overview_mode`` in :meth:`raw.plot() <mne.io.Raw.plot>` and related functions/methods (:gh:`10501` by `Eric Larson`_)
 
+- The ``pick_channels`` method gained a ``verbose`` parameter, allowing e.g. to suppress messages about removed projectors (:gh:`10544` by `Richard Höchenberger`_)
+
 Bugs
 ~~~~
 - Fix bug in :func:`mne.io.read_raw_brainvision` when BrainVision data are acquired with the Brain Products "V-Amp" amplifier and disabled lowpass filter is marked with value ``0`` (:gh:`10517` by :newcontrib:`Alessandro Tonin`)

logo/generate_mne_logos.py

@@ -168,7 +168,8 @@
 y = np.linspace(-1., 1., h_px // 2)
 X, Y = np.meshgrid(x, y)
 # initialize figure (no axes, margins, etc)
-fig = plt.figure(1, figsize=(w_px / dpi, h_px / dpi), facecolor='k', frameon=False, dpi=dpi)
+fig = plt.figure(1, figsize=(w_px / dpi, h_px / dpi), facecolor='k',
+                 frameon=False, dpi=dpi)
 ax = plt.Axes(fig, [0., 0., 1., 1.])
 ax.set_axis_off()
 fig.add_axes(ax)
@@ -199,5 +200,6 @@
 ax.set_xlim(xmin - xpad, xl[1] + xpad)
 ax.set_ylim(ymax + ypad, ymin - ypad)
 plt.draw()
-plt.savefig(op.join(static_dir, 'mne_logo_small.svg'), dpi=dpi, transparent=True)
+plt.savefig(op.join(static_dir, 'mne_logo_small.svg'),
+            dpi=dpi, transparent=True)
 plt.close()

mne/channels/channels.py

@@ -692,7 +692,8 @@ def pick_types(self, meg=False, eeg=False, stim=False, eog=False,
 
         return self
 
-    def pick_channels(self, ch_names, ordered=False):
+    @verbose
+    def pick_channels(self, ch_names, ordered=False, *, verbose=None):
         """Pick some channels.
 
         Parameters
@@ -704,6 +705,9 @@ def pick_channels(self, ch_names, ordered=False):
             the modified instance matches the order of ``ch_names``.
 
             .. versionadded:: 0.20.0
+        %(verbose)s
+
+            .. versionadded:: 1.1
 
         Returns
         -------

requirements.txt

@@ -9,7 +9,7 @@ h5io
 packaging
 pymatreader
 qtpy
-pyside6
+PySide6!=6.3.0
 pyobjc-framework-Cocoa>=5.2.0; platform_system=="Darwin"
 sip
 scikit-learn