From 90128c5a9de18f747876faf0a8e6fae7bb15a7cc Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Thu, 6 Jun 2019 08:41:09 -0700 Subject: [PATCH] Fixes for rust tests on azure pipelines linux --- azure-pipelines.yml | 4 +--- tox.ini | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 05ed0c3c..381ff0e7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: os: windows additional_variables: COVERAGE_IGNORE_WINDOWS: '# pragma: windows no cover' - TOX_TESTENV_PASSENV: COVERAGE_IGNORE_WINDOWS RUSTUP_HOME + TOX_TESTENV_PASSENV: COVERAGE_IGNORE_WINDOWS TEMP: C:\Temp # remove when dropping python2 - template: job--python-tox.yml@asottile parameters: @@ -30,7 +30,6 @@ jobs: pre_test: - task: UseRubyVersion@0 - template: step--git-install.yml - - template: step--rust-install.yml - bash: | testing/get-swift.sh echo '##vso[task.prependpath]/tmp/swift/usr/bin' @@ -41,7 +40,6 @@ jobs: os: linux pre_test: - task: UseRubyVersion@0 - - template: step--rust-install.yml - bash: | testing/get-swift.sh echo '##vso[task.prependpath]/tmp/swift/usr/bin' diff --git a/tox.ini b/tox.ini index a63b6533..e24c2470 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = py27,py36,py37,pypy,pypy3,pre-commit [testenv] deps = -rrequirements-dev.txt -passenv = HOME LOCALAPPDATA +passenv = HOME LOCALAPPDATA RUSTUP_HOME commands = coverage erase coverage run -m pytest {posargs:tests}