@@ -12,28 +12,28 @@ jobs:

     matrix:

       UbuntuPy36:

         python.version: '3.6'

-        vmImage: 'ubuntu-16.04'

+        vmImage: 'ubuntu-latest'

         tox_env: 'py36'

       UbuntuPy37:

         python.version: '3.7'

-        vmImage: 'ubuntu-16.04'

+        vmImage: 'ubuntu-latest'

         tox_env: 'py37'

       UbuntuPy38:

         python.version: '3.8'

-        vmImage: 'ubuntu-16.04'

+        vmImage: 'ubuntu-latest'

         tox_env: 'py38'

       macOSPy36:

         python.version: '3.6'

-        vmImage: 'macOS-10.13'

+        vmImage: 'macOS-latest'

         tox_env: 'py36'

       macOSPy37:

         python.version: '3.7'

-        vmImage: 'macOS-10.13'

+        vmImage: 'macOS-latest'

         tox_env: 'py37'

       macOSPy38:

         python.version: '3.8'

-        vmImage: 'macOS-10.13'

+        vmImage: 'macOS-latest'

         tox_env: 'py38'

       WindowsServerPy36:

@@ -10,44 +10,58 @@ jobs:

   strategy:

     # use cross-product when https://github.com/microsoft/azure-pipelines-yaml/issues/20 is solved

     matrix:

-      UbuntuPython36:

+      UbuntuPy36:

         python.version: '3.6'

         vmImage: 'ubuntu-16.04'

         tox_env: 'py36'

-      UbuntuPython37:

+      UbuntuPy37:

         python.version: '3.7'

         vmImage: 'ubuntu-16.04'

         tox_env: 'py37'

-      UbuntuPython38:

+      UbuntuPy38:

         python.version: '3.8'

         vmImage: 'ubuntu-16.04'

         tox_env: 'py38'

-      macOSPython36:

+      macOSPy36:

         python.version: '3.6'

         vmImage: 'macOS-10.13'

         tox_env: 'py36'

-      macOSPython37:

+      macOSPy37:

         python.version: '3.7'

         vmImage: 'macOS-10.13'

         tox_env: 'py37'

-      macOSPython38:

+      macOSPy38:

         python.version: '3.8'

         vmImage: 'macOS-10.13'

         tox_env: 'py38'

-      WindowsPython36:

+      WindowsServerPy36:

         python.version: '3.6'

         vmImage: 'vs2017-win2016'

         tox_env: 'py36'

-      WindowsPython37:

+      WindowsServerPy37:

         python.version: '3.7'

         vmImage: 'vs2017-win2016'

         tox_env: 'py37'

-      WindowsPython38:

+      WindowsServerPy38:

         python.version: '3.8'

         vmImage: 'vs2017-win2016'

         tox_env: 'py38'

+

+      WindowsPy36:

+        python.version: '3.6'

+        vmImage: 'windows-latest'

+        tox_env: 'py36'

+      WindowsPy37:

+        python.version: '3.7'

+        vmImage: 'windows-latest'

+        tox_env: 'py37'

+      WindowsPy38:

+        python.version: '3.8'

+        vmImage: 'windows-latest'

+        tox_env: 'py38'

+

   pool:

     vmImage: '$(vmImage)'

   steps:

@@ -70,7 +70,7 @@ jobs:

       versionSpec: '3.7'

   - script: pip install tox

     displayName: Install tox

-  - script: tox -e py37,report

+  - script: tox -e py37-alldeps,report

     displayName: Run the tests and generate coverage

   - script: |

       pip install codecov

@@ -13,41 +13,41 @@ jobs:

       UbuntuPython36:

         python.version: '3.6'

         vmImage: 'ubuntu-16.04'

-        tox_env: '36'

+        tox_env: 'py36'

       UbuntuPython37:

         python.version: '3.7'

         vmImage: 'ubuntu-16.04'

-        tox_env: '37'

+        tox_env: 'py37'

       UbuntuPython38:

         python.version: '3.8'

         vmImage: 'ubuntu-16.04'

-        tox_env: '38'

+        tox_env: 'py38'

       macOSPython36:

         python.version: '3.6'

         vmImage: 'macOS-10.13'

-        tox_env: '36'

+        tox_env: 'py36'

       macOSPython37:

         python.version: '3.7'

         vmImage: 'macOS-10.13'

-        tox_env: '37'

+        tox_env: 'py37'

       macOSPython38:

         python.version: '3.8'

         vmImage: 'macOS-10.13'

-        tox_env: '38'

+        tox_env: 'py38'

       WindowsPython36:

         python.version: '3.6'

         vmImage: 'vs2017-win2016'

-        tox_env: '36'

+        tox_env: 'py36'

       WindowsPython37:

         python.version: '3.7'

         vmImage: 'vs2017-win2016'

-        tox_env: '37'

+        tox_env: 'py37'

       WindowsPython38:

         python.version: '3.8'

         vmImage: 'vs2017-win2016'

-        tox_env: '38'

+        tox_env: 'py38'

   pool:

     vmImage: '$(vmImage)'

   steps:

@@ -56,11 +56,11 @@ jobs:

       versionSpec: '$(python.version)'

   - script: pip install tox

     displayName: Install tox

-  - script: tox -e bare$(tox_env)

-    displayName: Run the bare tests

+  - script: tox -e $(tox_env)-mindeps

+    displayName: Run the tests with minimal dependencies

   - script: tox -e clean

     displayName: Clean

-  - script: tox -e py$(tox_env)

+  - script: tox -e $(tox_env)-alldeps

     displayName: Run the tests

 - job: coverage

@@ -6,43 +6,76 @@ pr:

   - "*"

 jobs:

-- job: pytest36

+- job: pytest

+  strategy:

+    # use cross-product when https://github.com/microsoft/azure-pipelines-yaml/issues/20 is solved

+    matrix:

+      UbuntuPython36:

+        python.version: '3.6'

+        vmImage: 'ubuntu-16.04'

+        tox_env: '36'

+      UbuntuPython37:

+        python.version: '3.7'

+        vmImage: 'ubuntu-16.04'

+        tox_env: '37'

+      UbuntuPython38:

+        python.version: '3.8'

+        vmImage: 'ubuntu-16.04'

+        tox_env: '38'

+

+      macOSPython36:

+        python.version: '3.6'

+        vmImage: 'macOS-10.13'

+        tox_env: '36'

+      macOSPython37:

+        python.version: '3.7'

+        vmImage: 'macOS-10.13'

+        tox_env: '37'

+      macOSPython38:

+        python.version: '3.8'

+        vmImage: 'macOS-10.13'

+        tox_env: '38'

+

+      WindowsPython36:

+        python.version: '3.6'

+        vmImage: 'vs2017-win2016'

+        tox_env: '36'

+      WindowsPython37:

+        python.version: '3.7'

+        vmImage: 'vs2017-win2016'

+        tox_env: '37'

+      WindowsPython38:

+        python.version: '3.8'

+        vmImage: 'vs2017-win2016'

+        tox_env: '38'

+  pool:

+    vmImage: '$(vmImage)'

   steps:

   - task: UsePythonVersion@0

     inputs:

-      versionSpec: '3.6'

+      versionSpec: '$(python.version)'

   - script: pip install tox

-    displayName: 'Install tox'

-  - script: tox -e py36

-    displayName: 'Run the tests'

+    displayName: Install tox

+  - script: tox -e bare$(tox_env)

+    displayName: Run the bare tests

+  - script: tox -e clean

+    displayName: Clean

+  - script: tox -e py$(tox_env)

+    displayName: Run the tests

-- job: pytest37

+- job: coverage

   steps:

   - task: UsePythonVersion@0

     inputs:

       versionSpec: '3.7'

   - script: pip install tox

-    displayName: 'Install tox'

-  - script: tox -e py37

-    displayName: 'Run the tests'

-  - script: tox -e report

-    displayName: 'Test coverage'

+    displayName: Install tox

+  - script: tox -e py37,report

+    displayName: Run the tests and generate coverage

   - script: |

       pip install codecov

       codecov -t $(CODECOV_TOKEN) -f .coverage.xml

-    displayName: 'Test upload coverage'

-  - script: tox -e clean

-    displayName: 'Test cleanup'

-

-- job: pytest38

-  steps:

-  - task: UsePythonVersion@0

-    inputs:

-      versionSpec: '3.8'

-  - script: pip install tox

-    displayName: 'Install tox'

-  - script: tox -e py38

-    displayName: 'Run the tests'

+    displayName: Test upload coverage

 - job: pre_commit

   steps:

@@ -50,9 +83,9 @@ jobs:

     inputs:

       versionSpec: '3.7'

   - script: pip install tox

-    displayName: 'Install tox'

+    displayName: Install tox

   - script: tox -e pre-commit

-    displayName: 'Lining tests'

+    displayName: Lining tests

 - job: authors_check

   steps:

@@ -25,8 +25,24 @@ jobs:

     displayName: 'Install tox'

   - script: tox -e py37

     displayName: 'Run the tests'

-  - script: tox -e clean,report

+  - script: tox -e report

     displayName: 'Test coverage'

+  - script: |

+      pip install codecov

+      codecov -t $(CODECOV_TOKEN) -f .coverage.xml

+    displayName: 'Test upload coverage'

+  - script: tox -e clean

+    displayName: 'Test cleanup'

+

+- job: pytest38

+  steps:

+  - task: UsePythonVersion@0

+    inputs:

+      versionSpec: '3.8'

+  - script: pip install tox

+    displayName: 'Install tox'

+  - script: tox -e py38

+    displayName: 'Run the tests'

 - job: pre_commit

   steps:

@@ -1,33 +1,45 @@

+trigger:

+  branches:

+    include:

+    - master

+pr:

+  - "*"

+

 jobs:

-- job: unit_tests

+- job: pytest36

   steps:

-  - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"

-    displayName: Add conda to PATH

-

-  - script: conda env create --quiet --file environment.yml

-    displayName: Create Anaconda environment

-

-  - script: |

-      source activate adaptive

-      pip install -r test-requirements.txt

-    displayName: 'Install test-requirements.txt'

-

-  - script: |

-      source activate adaptive

-      pytest --verbose --cov=adaptive --cov-report term --cov-report html adaptive

+  - task: UsePythonVersion@0

+    inputs:

+      versionSpec: '3.6'

+  - script: pip install tox

+    displayName: 'Install tox'

+  - script: tox -e py36

     displayName: 'Run the tests'

-- job: linting_tests

+- job: pytest37

   steps:

-  - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"

-    displayName: Add conda to PATH

+  - task: UsePythonVersion@0

+    inputs:

+      versionSpec: '3.7'

+  - script: pip install tox

+    displayName: 'Install tox'

+  - script: tox -e py37

+    displayName: 'Run the tests'

+  - script: tox -e clean,report

+    displayName: 'Test coverage'

-  - script: |

-      pip install pre_commit

-      pre-commit install

-      pre-commit run --all-files --show-diff-on-failure

-    displayName: 'Run pre-commit'

+- job: pre_commit

+  steps:

+  - task: UsePythonVersion@0

+    inputs:

+      versionSpec: '3.7'

+  - script: pip install tox

+    displayName: 'Install tox'

+  - script: tox -e pre-commit

+    displayName: 'Lining tests'

+- job: authors_check

+  steps:

   - script: |

       MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

       if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

@@ -25,7 +25,7 @@ jobs:

   - script: |

       pip install pre_commit

       pre-commit install

-      pre-commit run --all-files

+      pre-commit run --all-files --show-diff-on-failure

     displayName: 'Run pre-commit'

   - script: |

@@ -32,3 +32,4 @@ jobs:

       MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

       if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

     displayName: 'Authors check'

+    continueOnError: true

@@ -1,28 +1,34 @@

-steps:

-- bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"

-  displayName: Add conda to PATH

+jobs:

+- job: unit_tests

+  steps:

+  - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"

+    displayName: Add conda to PATH

-- script: conda env create --quiet --file environment.yml

-  displayName: Create Anaconda environment

+  - script: conda env create --quiet --file environment.yml

+    displayName: Create Anaconda environment

-- script: |

-    source activate adaptive

-    pip install -r test-requirements.txt

-  displayName: 'Install test-requirements.txt'

+  - script: |

+      source activate adaptive

+      pip install -r test-requirements.txt

+    displayName: 'Install test-requirements.txt'

-- script: |

-    source activate adaptive

-    pytest --verbose --cov=adaptive --cov-report term --cov-report html adaptive

-  displayName: 'Run the tests'

+  - script: |

+      source activate adaptive

+      pytest --verbose --cov=adaptive --cov-report term --cov-report html adaptive

+    displayName: 'Run the tests'

-- script: |

-    MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

-    if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

-  continueOnError: true

-  displayName: 'Authors check'

+- job: linting_tests

+  steps:

+  - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"

+    displayName: Add conda to PATH

-- script: |

-    source activate adaptive

-    pre-commit install

-    pre-commit run --all-files

-  displayName: 'Run pre-commit'

+  - script: |

+      pip install pre_commit

+      pre-commit install

+      pre-commit run --all-files

+    displayName: 'Run pre-commit'

+

+  - script: |

+      MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

+      if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

+    displayName: 'Authors check'

@@ -23,5 +23,6 @@ steps:

 - script: |

     source activate adaptive

-    black . --check -t py36

-  displayName: 'Run lint tests'

+    pre-commit install

+    pre-commit run --all-files

+  displayName: 'Run pre-commit'

@@ -21,10 +21,6 @@ steps:

   continueOnError: true

   displayName: 'Authors check'

-- script: ./check_whitespace

-  continueOnError: true

-  displayName: 'Whitespace check'

-

 - script: |

     source activate adaptive

     black . --check -t py36

@@ -24,3 +24,8 @@ steps:

 - script: ./check_whitespace

   continueOnError: true

   displayName: 'Whitespace check'

+

+- script: |

+    source activate adaptive

+    black . --check -t py36

+  displayName: 'Run lint tests'

@@ -12,7 +12,7 @@ steps:

 - script: |

     source activate adaptive

-    py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

+    pytest --verbose --cov=adaptive --cov-report term --cov-report html adaptive

   displayName: 'Run the tests'

 - script: |

@@ -2,16 +2,17 @@ steps:

 - bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"

   displayName: Add conda to PATH

-- bash: sudo chown -R $USER /usr/share/miniconda

-  displayName: Take ownership of conda installation

+- script: conda env create --quiet --file environment.yml

+  displayName: Create Anaconda environment

-- script: conda env update --name root --quiet --file environment.yml

-  displayName: Create conda environment

-

-- script: pip install -r test-requirements.txt

+- script: |

+    source activate adaptive

+    pip install -r test-requirements.txt

   displayName: 'Install test-requirements.txt'

-- script: py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

+- script: |

+    source activate adaptive

+    py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

   displayName: 'Run the tests'

 - script: |

@@ -1,22 +1,12 @@

 steps:

-- task: CondaEnvironment@1

-  inputs:

-    packageSpecs: >

-      python=3.6

-      sortedcontainers

-      sortedcollections

-      scipy

-      holoviews

-      ipyparallel

-      distributed

-      ipykernel>=4.8*

-      jupyter_client>=5.2.2

-      ipywidgets

-      scikit-optimize

-      plotly

-    createCustomEnvironment: true

-    createOptions: "-c conda-forge"

-    environmentName: 'adaptive'

+- bash: echo "##vso[task.prependpath]/usr/share/miniconda/bin"

+  displayName: Add conda to PATH

+

+- bash: sudo chown -R $USER /usr/share/miniconda

+  displayName: Take ownership of conda installation

+

+- script: conda env update --name root --quiet --file environment.yml

+  displayName: Create conda environment

 - script: pip install -r test-requirements.txt

   displayName: 'Install test-requirements.txt'

new file mode 100644

@@ -0,0 +1,35 @@

+steps:

+- task: CondaEnvironment@1

+  inputs:

+    packageSpecs: >

+      python=3.6

+      sortedcontainers

+      sortedcollections

+      scipy

+      holoviews

+      ipyparallel

+      distributed

+      ipykernel>=4.8*

+      jupyter_client>=5.2.2

+      ipywidgets

+      scikit-optimize

+      plotly

+    createCustomEnvironment: true

+    createOptions: "-c conda-forge"

+    environmentName: 'adaptive'

+

+- script: pip install -r test-requirements.txt

+  displayName: 'Install test-requirements.txt'

+

+- script: py.test --verbose --cov=adaptive --cov-report term --cov-report html adaptive

+  displayName: 'Run the tests'

+

+- script: |

+    MISSING_AUTHORS=$(git shortlog -s HEAD | sed -e "s/^[0-9\t ]*//"| xargs -i sh -c 'grep -q "{}" AUTHORS.md || echo "{} missing from authors"')

+    if [ ! -z "$MISSING_AUTHORS" ]; then { echo $MISSING_AUTHORS; exit 1; }; fi

+  continueOnError: true

+  displayName: 'Authors check'

+

+- script: ./check_whitespace

+  continueOnError: true

+  displayName: 'Whitespace check'