Skip to content

Revert "Resolve Pip Related Errors (#12157)", Pin VirtualEnv #12169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2020
Merged

Revert "Resolve Pip Related Errors (#12157)", Pin VirtualEnv #12169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1beaa32
Revert "Resolve Pip Related Errors (#12157)"
scbedd Jun 23, 2020
4e47de1
pin virtualenv to an earlier version
scbedd Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/ci_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# requirements leveraged by ci tools
setuptools==44.1.0; python_version == '2.7'
setuptools==45.1.0; python_version >= '3.5'
virtualenv==20.0.24
virtualenv==20.0.23
wheel==0.34.2
Jinja2==2.11.1
packaging==20.4
Expand Down Expand Up @@ -33,3 +33,4 @@ pytest-cov==2.8.1
./tools/azure-sdk-tools



32 changes: 16 additions & 16 deletions eng/pipelines/templates/steps/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ steps:
- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml

- script: |
python -m pip install -r eng/ci_tools.txt
mkdir $(Build.SourcesDirectory)/env
python -m virtualenv $(Build.SourcesDirectory)/env
python -m pip install pip == 20.1
pip install -r eng/ci_tools.txt
pip --version
displayName: 'Prep Environment'

- ${{ parameters.BeforeTestSteps }}

- pwsh: |
$env:Path = "$(Build.SourcesDirectory)/env;" + $env:Path
python -m pip install pip==20.1
python -m pip install -r eng/ci_tools.txt
python -m pip --version

$env:PYTHON_HOME = ""
$env:VIRTUAL_ENV = "$(Build.SourcesDirectory)/env"

Write-Host 'python ./scripts/devops_tasks/setup_execute_tests.py "${{ parameters.BuildTargetingString }}" ${{ parameters.AdditionalTestArgs }} ${{ parameters.CoverageArg }} --mark_arg="${{ parameters.TestMarkArgument }}" --service="${{ parameters.ServiceDirectory }}" --toxenv="${{ parameters.ToxTestEnv }}" --injected-packages="${{ parameters.InjectedPackages }}" ${{ parameters.ToxEnvParallel }}"'
python ./scripts/devops_tasks/setup_execute_tests.py "${{ parameters.BuildTargetingString }}" ${{ parameters.AdditionalTestArgs }} ${{ parameters.CoverageArg }} --mark_arg="${{ parameters.TestMarkArgument }}" --service="${{ parameters.ServiceDirectory }}" --toxenv="${{ parameters.ToxTestEnv }}" --injected-packages="${{ parameters.InjectedPackages }}" ${{ parameters.ToxEnvParallel }}

env: ${{ parameters.EnvVars }}
- task: PythonScript@0
displayName: 'Run Tests'
inputs:
scriptPath: 'scripts/devops_tasks/setup_execute_tests.py'
arguments: >-
"${{ parameters.BuildTargetingString }}"
${{ parameters.AdditionalTestArgs }}
${{ parameters.CoverageArg }}
--mark_arg="${{ parameters.TestMarkArgument }}"
--service="${{ parameters.ServiceDirectory }}"
--toxenv="${{ parameters.ToxTestEnv }}"
--injected-packages="${{ parameters.InjectedPackages }}"
${{ parameters.ToxEnvParallel }}
env: ${{ parameters.EnvVars }}

- ${{ parameters.AfterTestSteps }}

Expand Down