From 5571132b76ee2a611c68fc5349d459e1f399592a Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 14 Oct 2019 11:42:38 +0100 Subject: [PATCH 1/2] Use correct pip/pytest on azure --- ci/azure-pipelines-steps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure-pipelines-steps.yml b/ci/azure-pipelines-steps.yml index 3337485be857..d55d95334810 100644 --- a/ci/azure-pipelines-steps.yml +++ b/ci/azure-pipelines-steps.yml @@ -54,7 +54,7 @@ steps: displayName: 'Install dependencies with pip' - bash: | - MPLLOCALFREETYPE=1 pip install -ve . || + MPLLOCALFREETYPE=1 python -m pip install -ve . || [[ "$PYTHON_VERSION" = 'Pre' ]] displayName: "Install self" @@ -62,7 +62,7 @@ steps: displayName: 'print env' - bash: | - PYTHONFAULTHANDLER=1 pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2 || + PYTHONFAULTHANDLER=1 python -m pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2 || [[ "$PYTHON_VERSION" = 'Pre' ]] displayName: 'pytest' From 722eac5163d2b6c7764b9fdba3fbd38d71ba0305 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 14 Oct 2019 12:14:32 +0100 Subject: [PATCH 2/2] Try installing numpy first --- ci/azure-pipelines-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure-pipelines-steps.yml b/ci/azure-pipelines-steps.yml index d55d95334810..75114b535eab 100644 --- a/ci/azure-pipelines-steps.yml +++ b/ci/azure-pipelines-steps.yml @@ -49,7 +49,7 @@ steps: - bash: | python -m pip install --upgrade pip - pip install -r requirements/testing/travis_all.txt -r requirements/testing/travis36.txt || + python -m pip install -r requirements/testing/travis_all.txt -r requirements/testing/travis36.txt || [[ "$PYTHON_VERSION" = 'Pre' ]] displayName: 'Install dependencies with pip'