Update from scikit-bio/scikit-bio@00e164f

Author: mataton

_sources/contribute.rst.txt

@@ -173,6 +173,8 @@ When done, activate the environment::
 
 This will install scikit-bio to the current conda environment. After this, you can use scikit-bio like a normal user (e.g., you can do ``import skbio`` in Python code). When you edit the code in the this directory, the changes will be immediately reflected as you use the software.
 
+.. note:: If you run into OpenMP compile issues (or have other reasons to avoid OpenMP), you can avoid it by setting ``DISABLE_OPENMP=Y`` in the build environment.
+
 5. Test the installation::
 
     make test
@@ -466,4 +468,4 @@ Congratulations! Your code is now an integral part of scikit-bio, and will benef
 Benchmarks
 ----------
 
-Scikit-bio utilizes `ASV <https://github.com/airspeed-velocity/asv>`_ to run benchmarks on a selection of its functions. Benchmarks help the development team prevent performance regression, the unintentional loss of performance which may come from modified code. Scikit-bio's benchmarks are run against every release of scikit-bio, starting with version ``0.6.1``. We welcome the addition of new benchmarks or the expansion of existing benchmarks to further protect against performance regression. If you are interested in contributing to our benchmarking system please see our `benchmark repository <https://github.com/scikit-bio/scikit-bio-benchmarks>`_.
+Scikit-bio utilizes `ASV <https://github.com/airspeed-velocity/asv>`_ to run benchmarks on a selection of its functions. Benchmarks help the development team prevent performance regression, the unintentional loss of performance which may come from modified code. Scikit-bio's benchmarks are run against every release of scikit-bio, starting with version ``0.6.1``. We welcome the addition of new benchmarks or the expansion of existing benchmarks to further protect against performance regression. If you are interested in contributing to our benchmarking system please see our `benchmark repository <https://github.com/scikit-bio/scikit-bio-benchmarks>`_.

contribute.html

@@ -586,6 +586,10 @@ <h2>Set up a workspace<a class="headerlink" href="#set-up-a-workspace" title="Li
 </li>
 </ol>
 <p>This will install scikit-bio to the current conda environment. After this, you can use scikit-bio like a normal user (e.g., you can do <code class="docutils literal notranslate"><span class="pre">import</span> <span class="pre">skbio</span></code> in Python code). When you edit the code in the this directory, the changes will be immediately reflected as you use the software.</p>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>If you run into OpenMP compile issues (or have other reasons to avoid OpenMP), you can avoid it by setting <code class="docutils literal notranslate"><span class="pre">DISABLE_OPENMP=Y</span></code> in the build environment.</p>
+</div>
 <ol class="arabic" start="5">
 <li><p>Test the installation:</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">make</span> <span class="n">test</span>