MNT rename main branch

Author: TomDLT

doc/conf.py

@@ -65,8 +65,8 @@
 # source_suffix = ['.rst', '.md']
 source_suffix = '.rst'
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = u'Voxelwise modeling tutorials'
@@ -170,15 +170,15 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'Tutorials.tex', u'Tutorials Documentation',
+    (main_doc, 'Tutorials.tex', u'Tutorials Documentation',
      u'Gallant lab', 'manual'),
 ]
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, 'tutorials', u'Tutorials Documentation', [author], 1)
+man_pages = [(main_doc, 'tutorials', u'Tutorials Documentation', [author], 1)
              ]
 
 # -- Options for Texinfo output -------------------------------------------
@@ -187,7 +187,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'Tutorials', u'Tutorials Documentation', author, 'Tutorials',
+    (main_doc, 'Tutorials', u'Tutorials Documentation', author, 'Tutorials',
      'One line description of project.', 'Miscellaneous'),
 ]
 

setup.py

@@ -19,7 +19,7 @@
     "networkx",
     "nltk",
     "pycortex",
-    "himalaya @ git+https://github.com/gallantlab/himalaya@master#egg=himalaya",  # noqa
+    "himalaya @ git+https://github.com/gallantlab/himalaya@main#egg=himalaya",
     "pymoten @ git+https://github.com/gallantlab/pymoten@master#egg=pymoten",
 ]
 

tutorials/README.rst

@@ -1,3 +1,3 @@
 (If you are looking for some Jupyter notebooks, check the `notebooks
-<https://github.com/gallantlab/voxelwise_tutorials/tree/master/tutorials/notebooks>`_
+<https://github.com/gallantlab/voxelwise_tutorials/tree/main/tutorials/notebooks>`_
 directory.)

tutorials/movies_3T/04_plot_motion_energy_model.py

@@ -206,7 +206,6 @@
        ylabel='motion energy model')
 plt.show()
 
-
 ###############################################################################
 # Interestingly, the well predicted voxels are different in the two models.
 # To further describe these differences, we can plot both performances on the

voxelwise_tutorials/delayer.py

@@ -7,7 +7,7 @@ class Delayer(BaseEstimator, TransformerMixin):
     """Scikit-learn Transformer to add delays to features.
 
     This assumes that the samples are ordered in time.
-    Adding a delay of 0 corresponds to leave the features unchanged.
+    Adding a delay of 0 corresponds to leaving the features unchanged.
     Adding a delay of 1 corresponds to using features from the previous sample.
 
     Adding multiple delays can be used to take into account the slow