From fb57a68d59ff46692ee8ec74e7c279d3b035e28c Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Mon, 27 May 2019 16:05:56 -0400 Subject: [PATCH] Echo which python version is in use Signed-off-by: Dan Ryan --- .azure-pipelines/steps/create-virtualenv.yml | 3 ++- .azure-pipelines/steps/install-dependencies.yml | 2 +- .azure-pipelines/steps/run-tests-linux.yml | 1 + .azure-pipelines/steps/run-tests-windows.yml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/steps/create-virtualenv.yml b/.azure-pipelines/steps/create-virtualenv.yml index 48bb2233..e0461780 100644 --- a/.azure-pipelines/steps/create-virtualenv.yml +++ b/.azure-pipelines/steps/create-virtualenv.yml @@ -29,7 +29,8 @@ steps: - script: | echo "Python path: $(PY_EXE)" echo "GIT_SSL_CAINFO: $(GIT_SSL_CAINFO)" - $(PY_EXE) -m pipenv install --deploy --dev + echo "PIPENV PYTHON VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)" + $(PY_EXE) -m pipenv install --deploy --dev --python $(PIPENV_DEFAULT_PYTHON_VERSION) env: PIPENV_DEFAULT_PYTHON_VERSION: '$(PIPENV_DEFAULT_PYTHON_VERSION)' PYTHONWARNINGS: 'ignore:DEPRECATION' diff --git a/.azure-pipelines/steps/install-dependencies.yml b/.azure-pipelines/steps/install-dependencies.yml index 16d2bd28..79684d4a 100644 --- a/.azure-pipelines/steps/install-dependencies.yml +++ b/.azure-pipelines/steps/install-dependencies.yml @@ -1,5 +1,5 @@ steps: -- script: 'python -m pip install --upgrade pip setuptools wheel && python -m pip install -e .[tests] --upgrade' +- script: 'python -m pip install --upgrade pip setuptools wheel -e .[dev,tests] --upgrade' displayName: Upgrade Pip & Install Pipenv env: PYTHONWARNINGS: 'ignore:DEPRECATION' diff --git a/.azure-pipelines/steps/run-tests-linux.yml b/.azure-pipelines/steps/run-tests-linux.yml index 2a1c8a5a..0298e4ad 100644 --- a/.azure-pipelines/steps/run-tests-linux.yml +++ b/.azure-pipelines/steps/run-tests-linux.yml @@ -1,6 +1,7 @@ steps: - script: | # Fix Git SSL errors + echo "Using pipenv python version: $PIPENV_DEFAULT_PYTHON_VERSION" git submodule sync && git submodule update --init --recursive pipenv run pytest --junitxml=test-results.xml displayName: Run integration tests diff --git a/.azure-pipelines/steps/run-tests-windows.yml b/.azure-pipelines/steps/run-tests-windows.yml index db782c01..5d854a9b 100644 --- a/.azure-pipelines/steps/run-tests-windows.yml +++ b/.azure-pipelines/steps/run-tests-windows.yml @@ -6,6 +6,7 @@ steps: displayName: Fix Temp Variable - script: | + echo "Using pipenv python version: $PIPENV_DEFAULT_PYTHON_VERSION" git submodule sync && git submodule update --init --recursive pipenv run pytest -ra --ignore=pipenv\patched --ignore=pipenv\vendor --junitxml=test-results.xml tests displayName: Run integration tests