Skip to content

Commit

Permalink
Bug 1614592 [wpt PR 21722] - [Azure Pipelines] Consistently use the "…
Browse files Browse the repository at this point in the history
…Use Python Version" task, a=testonly

Automatic update from web-platform-tests
[Azure Pipelines] Consistently use the "Use Python Version" task (#21722)

https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/use-python-version?view=azure-devops

The default python/pip on the macOS VMs don't work any longer. It may be
possible to fix this, but to fix the urgent issue use the method
that's supported by Azure Pipelines.

The python version will remain unchanged at 2.7.17, but pip will
change from 19.3.1 to 20.0.2.

pip_install.yml can be simplified because the remaining code path is
the same for macOS and Windows.

Fixes web-platform-tests/wpt#21691.
--

wpt-commits: cd29a90fe885290847182ec381b7023099ce60d9
wpt-pr: 21722

UltraBlame original commit: 4e05fce7636d0a9747a13aa2918cb198cf9caf83
  • Loading branch information
marco-c committed Feb 16, 2020
1 parent b2eecfd commit 87a7632
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 186 deletions.
128 changes: 128 additions & 0 deletions testing/web-platform/tests/.azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,22 @@ macOS
steps
:
-
task
:
UsePythonVersion
0
inputs
:
versionSpec
:
'
2
.
7
.
x
'
-
template
:
tools
Expand Down Expand Up @@ -514,6 +530,22 @@ macOS
steps
:
-
task
:
UsePythonVersion
0
inputs
:
versionSpec
:
'
2
.
7
.
x
'
-
template
:
tools
Expand Down Expand Up @@ -774,6 +806,22 @@ macOS
steps
:
-
task
:
UsePythonVersion
0
inputs
:
versionSpec
:
'
2
.
7
.
x
'
-
template
:
tools
Expand Down Expand Up @@ -1157,6 +1205,22 @@ ci
steps
:
-
task
:
UsePythonVersion
0
inputs
:
versionSpec
:
'
2
.
7
.
x
'
-
template
:
tools
Expand Down Expand Up @@ -1436,6 +1500,22 @@ ci
steps
:
-
task
:
UsePythonVersion
0
inputs
:
versionSpec
:
'
2
.
7
.
x
'
-
template
:
tools
Expand Down Expand Up @@ -1729,6 +1809,22 @@ full
checkout
required
-
task
:
UsePythonVersion
0
inputs
:
versionSpec
:
'
2
.
7
.
x
'
-
template
:
tools
Expand Down Expand Up @@ -4859,6 +4955,22 @@ macOS
steps
:
-
task
:
UsePythonVersion
0
inputs
:
versionSpec
:
'
2
.
7
.
x
'
-
template
:
tools
Expand Down Expand Up @@ -5273,6 +5385,22 @@ macOS
steps
:
-
task
:
UsePythonVersion
0
inputs
:
versionSpec
:
'
2
.
7
.
x
'
-
template
:
tools
Expand Down
186 changes: 0 additions & 186 deletions testing/web-platform/tests/tools/ci/azure/pip_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,167 +9,6 @@ steps
-
script
:
|
if
[
which
pip
=
'
/
usr
/
bin
/
pip
'
]
;
then
#
sudo
pip
install
is
not
used
because
some
packages
(
e
.
g
.
tox
)
depend
on
#
system
packages
(
e
.
g
.
setuptools
)
which
cannot
be
upgraded
due
to
System
#
Integrity
Protection
see
https
:
/
/
stackoverflow
.
com
/
a
/
33004920
.
pip
install
-
-
user
{
{
parameters
.
packages
}
}
echo
"
#
#
vso
[
task
.
prependpath
]
HOME
/
Library
/
Python
/
2
.
7
/
bin
"
else
pip
-
-
disable
-
pip
-
version
-
check
install
-
-
upgrade
{
{
parameters
.
packages
}
}
fi
displayName
:
'
Install
Python
packages
(
macOS
)
'
condition
:
and
(
succeeded
(
)
eq
(
variables
[
'
Agent
.
OS
'
]
'
Darwin
'
)
)
-
script
:
pip
-
-
Expand Down Expand Up @@ -197,29 +36,4 @@ displayName
Install
Python
packages
(
Windows
)
'
condition
:
and
(
succeeded
(
)
eq
(
variables
[
'
Agent
.
OS
'
]
'
Windows_NT
'
)
)

0 comments on commit 87a7632

Please sign in to comment.