[FIX] rtd line overflow (#336)

* [v0.4.3] just work already

* [FIX] removed mltbx for now

* [FIX] removed mltbx for now, v0.4.2

* [NOFIX] vtk still not working

* [FIX] removed icon

* [DOCS] rtd updates

* [FIX] RTD among other thangs

* [FIX] RTD among other thangs blakc

* [FIX] rtd

* mypy fixes

* [FIX] rtd yeah?

* [FIX] rtd yeah?

* [FIX] rtd yeah cmon?

* [DOC] added plot_hemispheres API

* [DOC] added plot_hemispheres API - black

* [FIX] SLM tests comment out unfinished business

* [FIX] SLM tests comment out unfinished business - black

* [NEW] scktlearn unit test

* [NEW] spin test tuts

* [NEW] spin test tuts - black

* [NEW] spin test tuts - black

* [NEW] spin test tuts - black

* [FIX] rtd line overflow

docs/python/tutorials/plot_tutorial_02_context.html

@@ -14942,7 +14942,12 @@ <h2 id="Genetics">Genetics<a class="anchor-link" href="#Genetics">&#182;</a></h2
 
 <span class="c1"># Spin permutation testing for two cortical maps</span>
 <span class="n">spin_p</span><span class="p">,</span> <span class="n">spin_d</span> <span class="o">=</span> <span class="n">spin_test</span><span class="p">(</span><span class="n">t_stat_schaefer_100</span><span class="p">,</span> <span class="n">expression</span><span class="p">[</span><span class="s2">&quot;WFDC1&quot;</span><span class="p">],</span> <span class="n">surface_name</span><span class="o">=</span><span class="s1">&#39;fsa5&#39;</span><span class="p">,</span>
+<<<<<<< HEAD
+                           <span class="n">parcellation_name</span><span class="o">=</span><span class="s1">&#39;schaefer_100&#39;</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="s1">&#39;pearson&#39;</span><span class="p">,</span> <span class="n">n_rot</span><span class="o">=</span><span class="mi">1000</span><span class="p">,</span> 
+                           <span class="n">null_dist</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+=======
                       <span class="n">parcellation_name</span><span class="o">=</span><span class="s1">&#39;schaefer_100&#39;</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="s1">&#39;pearson&#39;</span><span class="p">,</span> <span class="n">n_rot</span><span class="o">=</span><span class="mi">1000</span><span class="p">,</span> <span class="n">null_dist</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
+>>>>>>> ec4341f84bd6499aebb512df8e8fffe40e7e1483
 
 <span class="c1"># Store p-value and null distribution</span>
 <span class="n">p_and_d</span> <span class="o">=</span> <span class="p">{</span><span class="s1">&#39;wfdc1&#39;</span><span class="p">:</span> <span class="p">[</span><span class="n">spin_p</span><span class="p">,</span> <span class="n">spin_d</span><span class="p">]}</span>
@@ -14954,7 +14959,12 @@ <h2 id="Genetics">Genetics<a class="anchor-link" href="#Genetics">&#182;</a></h2
 <span class="k">for</span> <span class="n">k</span><span class="p">,</span> <span class="p">(</span><span class="n">fn</span><span class="p">,</span> <span class="n">dd</span><span class="p">)</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">(</span><span class="n">p_and_d</span><span class="o">.</span><span class="n">items</span><span class="p">()):</span>
     <span class="n">axs</span><span class="o">.</span><span class="n">hist</span><span class="p">(</span><span class="n">dd</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="n">bins</span><span class="o">=</span><span class="mi">50</span><span class="p">,</span> <span class="n">density</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span> <span class="n">color</span><span class="o">=</span><span class="s1">&#39;#A8221C&#39;</span><span class="p">,</span> <span class="n">edgecolor</span><span class="o">=</span><span class="s1">&#39;white&#39;</span><span class="p">,</span> <span class="n">lw</span><span class="o">=</span><span class="mf">0.5</span><span class="p">)</span>
     <span class="n">axs</span><span class="o">.</span><span class="n">axvline</span><span class="p">(</span><span class="n">df</span><span class="o">.</span><span class="n">x</span><span class="o">.</span><span class="n">corr</span><span class="p">(</span><span class="n">df</span><span class="o">.</span><span class="n">y</span><span class="p">),</span> <span class="n">lw</span><span class="o">=</span><span class="mf">1.5</span><span class="p">,</span> <span class="n">ls</span><span class="o">=</span><span class="s1">&#39;--&#39;</span><span class="p">,</span> <span class="n">color</span><span class="o">=</span><span class="s1">&#39;k&#39;</span><span class="p">,</span> <span class="n">dashes</span><span class="o">=</span><span class="p">(</span><span class="mi">2</span><span class="p">,</span> <span class="mi">3</span><span class="p">),</span>
+<<<<<<< HEAD
+                <span class="n">label</span><span class="o">=</span><span class="s1">&#39;$r$=</span><span class="si">{:.2f}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">df</span><span class="o">.</span><span class="n">x</span><span class="o">.</span><span class="n">corr</span><span class="p">(</span><span class="n">df</span><span class="o">.</span><span class="n">y</span><span class="p">))</span> <span class="o">+</span> 
+                <span class="s1">&#39;</span><span class="se">\n</span><span class="s1">$p$=</span><span class="si">{:.4f}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">dd</span><span class="p">[</span><span class="mi">0</span><span class="p">]))</span>
+=======
                    <span class="n">label</span><span class="o">=</span><span class="s1">&#39;$r$=</span><span class="si">{:.2f}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">df</span><span class="o">.</span><span class="n">x</span><span class="o">.</span><span class="n">corr</span><span class="p">(</span><span class="n">df</span><span class="o">.</span><span class="n">y</span><span class="p">))</span> <span class="o">+</span> <span class="s1">&#39;</span><span class="se">\n</span><span class="s1">$p$=</span><span class="si">{:.4f}</span><span class="s1">&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">dd</span><span class="p">[</span><span class="mi">0</span><span class="p">]))</span>
+>>>>>>> ec4341f84bd6499aebb512df8e8fffe40e7e1483
     <span class="n">axs</span><span class="o">.</span><span class="n">set_xlabel</span><span class="p">(</span><span class="s1">&#39;Null correlations </span><span class="se">\n</span><span class="s1"> (</span><span class="si">{}</span><span class="s1">)&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="s1">&#39;wfdc1&#39;</span><span class="p">))</span>
     <span class="n">axs</span><span class="o">.</span><span class="n">set_ylabel</span><span class="p">(</span><span class="s1">&#39;Density&#39;</span><span class="p">)</span>
     <span class="n">axs</span><span class="o">.</span><span class="n">spines</span><span class="p">[</span><span class="s1">&#39;top&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">set_visible</span><span class="p">(</span><span class="kc">False</span><span class="p">)</span>

docs/python/tutorials/plot_tutorial_02_context.ipynb

@@ -281,7 +281,12 @@
     "\n",
     "# Spin permutation testing for two cortical maps\n",
     "spin_p, spin_d = spin_test(t_stat_schaefer_100, expression[\"WFDC1\"], surface_name='fsa5',\n",
+<<<<<<< HEAD
+    "                           parcellation_name='schaefer_100', type='pearson', n_rot=1000, \n",
+    "                           null_dist=True)\n",
+=======
     "                      parcellation_name='schaefer_100', type='pearson', n_rot=1000, null_dist=True)\n",
+>>>>>>> ec4341f84bd6499aebb512df8e8fffe40e7e1483
     "\n",
     "# Store p-value and null distribution\n",
     "p_and_d = {'wfdc1': [spin_p, spin_d]}\n",
@@ -293,7 +298,12 @@
     "for k, (fn, dd) in enumerate(p_and_d.items()):\n",
     "    axs.hist(dd[1], bins=50, density=True, color='#A8221C', edgecolor='white', lw=0.5)\n",
     "    axs.axvline(df.x.corr(df.y), lw=1.5, ls='--', color='k', dashes=(2, 3),\n",
+<<<<<<< HEAD
+    "                label='$r$={:.2f}'.format(df.x.corr(df.y)) + \n",
+    "                '\\n$p$={:.4f}'.format(dd[0]))\n",
+=======
     "                   label='$r$={:.2f}'.format(df.x.corr(df.y)) + '\\n$p$={:.4f}'.format(dd[0]))\n",
+>>>>>>> ec4341f84bd6499aebb512df8e8fffe40e7e1483
     "    axs.set_xlabel('Null correlations \\n ({})'.format('wfdc1'))\n",
     "    axs.set_ylabel('Density')\n",
     "    axs.spines['top'].set_visible(False)\n",