MAINT: Tweak versions for doc builds (#7880)

Author: larsoner

doc/_static/style.css

@@ -85,6 +85,11 @@ blockquote {
     margin-bottom: 5px;
 }
 
+.devbar a {
+    color: #fff;
+    font-weight: bold;
+}
+
 #navbar a:hover {
     color: rgb(242, 80, 80);
 }

doc/_templates/layout.html

@@ -2,6 +2,7 @@
 
 {% block extrahead %}
 
+    <link rel="canonical" href="https://mne.tools/stable/index.html" />
     <script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>
 
 {% if use_google_analytics|tobool %}
@@ -52,7 +53,10 @@
 {% block relbar1 %}
 {% if build_dev_html|tobool %}
 <div class="d-block devbar alert alert-danger">
-This documentation is for <strong>development version {{ release }}</strong>.
+This is documentation for the <em>unstable development version</em> of MNE-Python,
+<a href="https://mne.tools/dev/install/advanced.html#using-the-development-version-of-mne-python-latest-master">available here</a>.
+Or, switch to documentation for the <a href="https://mne.tools/stable">current stable version</a>.
+
 </div>
 {% endif %}
 
@@ -101,4 +105,5 @@
     <p>&copy; Copyright {{ copyright }}.</p>
   </div>
 </footer>
+  <script src="https://mne.tools/versionwarning.js"></script>
 {%- endblock %}

environment.yml

@@ -33,8 +33,8 @@ dependencies:
 - pip:
   - mne
   - https://github.com/numpy/numpydoc/archive/master.zip
-  - pyvista>=0.24
-  - mayavi
+  - pyvista==0.24
+  - https://github.com/enthought/mayavi/archive/master.zip
   - PySurfer[save_movie]
   - dipy --only-binary dipy
   - nibabel

mne/conftest.py

@@ -79,7 +79,7 @@ def pytest_configure(config):
     ignore:scipy\.gradient is deprecated.*:DeprecationWarning
     ignore:sklearn\.externals\.joblib is deprecated.*:FutureWarning
     ignore:The sklearn.*module.*deprecated.*:FutureWarning
-    ignore:.*TraitTuple.*trait.*handler.*deprecated.*:DeprecationWarning
+    ignore:.*trait.*handler.*deprecated.*:DeprecationWarning
     ignore:.*rich_compare.*metadata.*deprecated.*:DeprecationWarning
     ignore:.*In future, it will be an error for 'np.bool_'.*:DeprecationWarning
     ignore:.*Converting `np\.character` to a dtype is deprecated.*:DeprecationWarning

mne/decoding/transformer.py

@@ -123,10 +123,12 @@ def __init__(self, info=None, scalings=None, with_mean=True,
             self._scaler = _ConstantScaler(info, scalings, self.with_std)
         elif scalings == 'mean':
             from sklearn.preprocessing import StandardScaler
-            self._scaler = StandardScaler(self.with_mean, self.with_std)
+            self._scaler = StandardScaler(
+                with_mean=self.with_mean, with_std=self.with_std)
         else:  # scalings == 'median':
             from sklearn.preprocessing import RobustScaler
-            self._scaler = RobustScaler(self.with_mean, self.with_std)
+            self._scaler = RobustScaler(
+                with_centering=self.with_mean, with_scaling=self.with_std)
 
     def fit(self, epochs_data, y=None):
         """Standardize data across channels.

mne/gui/_coreg_gui.py

@@ -73,7 +73,7 @@
                         FileDialog, GUI)
 from traits.api import (Bool, Button, cached_property, DelegatesTo, Directory,
                         Enum, Float, HasTraits, HasPrivateTraits, Instance,
-                        Int, on_trait_change, Property, Str, List, RGBColor)
+                        Int, on_trait_change, Property, Str, List)
 from traitsui.api import (View, Item, Group, HGroup, VGroup, VGrid, EnumEditor,
                           Handler, Label, Spring, InstanceEditor, StatusItem,
                           UIInfo)
@@ -101,6 +101,11 @@
                       laggy_float_editor_scale, laggy_float_editor_deg,
                       laggy_float_editor_mm, laggy_float_editor_weight)
 
+try:
+    from traitsui.api import RGBColor
+except ImportError:
+    from traits.api import RGBColor
+
 defaults = DEFAULTS['coreg']
 
 

mne/gui/_viewer.py

@@ -14,12 +14,16 @@
 from mayavi.tools.mlab_scene_model import MlabSceneModel
 from traits.api import (HasTraits, HasPrivateTraits, on_trait_change,
                         Instance, Array, Bool, Button, Enum, Float, Int, List,
-                        Range, Str, RGBColor, Property, cached_property,
-                        ArrayOrNone)
+                        Range, Str, Property, cached_property, ArrayOrNone)
 from traitsui.api import (View, Item, HGroup, VGrid, VGroup, Spring,
                           TextEditor)
 from tvtk.api import tvtk
 
+try:
+    from traitsui.api import RGBColor
+except ImportError:
+    from traits.api import RGBColor
+
 from ..defaults import DEFAULTS
 from ..surface import _CheckInside, _DistanceQuery
 from ..transforms import apply_trans

mne/inverse_sparse/tests/test_gamma_map.py

@@ -70,7 +70,7 @@ def test_gamma_map():
 
     stc = gamma_map(evoked, forward, cov, alpha, tol=1e-4,
                     xyz_same_gamma=False, update_mode=1)
-    _check_stc(stc, evoked, 82010, 'lh', fwd=forward)
+    _check_stc(stc, evoked, 82010, 'lh', fwd=forward, dist_limit=4., ratio=20.)
 
     dips = gamma_map(evoked, forward, cov, alpha, tol=1e-4,
                      xyz_same_gamma=False, update_mode=1,

mne/io/ctf/tests/test_ctf.py

@@ -346,7 +346,7 @@ def test_read_ctf_annotations():
        378391, 380800, 382859, 385161, 387093, 389434, 391624, 393785,  # noqa
        396093, 398214, 400198, 402166, 404104, 406047, 408372, 410686,  # noqa
        413029, 414975, 416850, 418797, 420824, 422959, 425026, 427215,  # noqa
-       429278, 431668
+       429278, 431668  # noqa
     ]) - 1  # Fieldtrip has 1 sample difference with MNE
 
     raw = RawArray(

mne/preprocessing/ica.py

@@ -117,7 +117,7 @@ def _check_for_unsupported_ica_channels(picks, info, allow_ref_meg=False):
     if not check:
         raise ValueError('Invalid channel type%s passed for ICA: %s.'
                          'Only the following types are supported: %s'
-                         .format(_pl(chs), chs, types))
+                         % (_pl(chs), chs, types))
 
 
 @fill_doc