Merge remote-tracking branch 'origin/master'

Author: lmcinnes

appveyor.yml

@@ -20,6 +20,7 @@ install:
   - "conda create -q -n test-environment python=%PYTHON_VERSION% numpy scipy scikit-learn numba pandas bokeh holoviews datashader scikit-image pytest"
   - activate test-environment
   - pip install "tensorflow>=2.1"
+  - pip install pytest-benchmark
   - pip install -e .
 
 test_script:

azure-pipelines.yml

@@ -37,7 +37,7 @@ jobs:
         displayName: 'Install package'
 
       - script: |
-          pip install pytest
+          pip install pytest pytest-benchmark
           pytest --show-capture=no -v --disable-warnings --junitxml=pytest.xml
         displayName: 'Run tests'
 
@@ -77,7 +77,7 @@ jobs:
         displayName: 'Install package'
 
       - script: |
-          pip install pytest
+          pip install pytest pytest-benchmark
           pytest --show-capture=no -v --disable-warnings --junitxml=pytest.xml
         displayName: 'Run tests'
 
@@ -117,7 +117,7 @@ jobs:
         displayName: 'Install package'
 
       - script: |
-          pip install pytest
+          pip install pytest pytest-benchmark
           pytest --show-capture=no -v --disable-warnings --junitxml=pytest.xml
         displayName: 'Run tests'
 
@@ -150,7 +150,7 @@ jobs:
           pip install -e .
           pip install .[plot]
           pip install .[parametric_umap]
-          pip install pytest
+          pip install pytest pytest-benchmark
           pip install pytest-cov
           pip install coveralls
         displayName: 'Install package'

ci_scripts/install.sh

@@ -50,7 +50,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
     conda install --yes "tensorflow>=2.0.0"
   else
     conda create -q -n testenv --yes python=$PYTHON_VERSION numpy scipy scikit-learn \
-          numba pandas bokeh holoviews datashader scikit-image pytest \
+          numba pandas bokeh holoviews datashader scikit-image pytest pytest-benchmark \
           "tensorflow-mkl>=2.2.0"
   fi
 
@@ -64,7 +64,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
 
   if [[ "$COVERAGE" == "true" ]]; then
       pip install coverage coveralls
-      pip install pytest-cov  # pytest coverage plugin
+      pip install pytest-cov pytest-benchmark # pytest coverage plugin
   fi
 
   python --version