Bug 1834350 [wpt PR 40130] - Don't require virtualenv binary, a=testonly

marco-c · marco-c · commit b42008749fa3 · 2023-06-16T01:34:02.000Z
Automatic update from web-platform-tests
Don't require virtualenv binary

With Python 3 we can use python3 -m venv to create a virtualenv.

The main dififculty is that we're missing activate_this.py which we use
to activate the environment. But we can do the relevant path / env manipulations
ourselves and so cut down the number of dependencies.

--
Try falling back to `pip` if `pip3` doesn't exist

--
Update documentation

--

wpt-commits: 7eed90bb584ed77bf7227233501882a43f90d05e, 5bb7544e8c50cb3bcc55bd4508cbbc94b1209302, 4fd791ba8cda63f0fdece4bdb72a431f198b582e
wpt-pr: 40130

UltraBlame original commit: 044925cdba0413292d139c32915f8c33484f3fb3
diff --git a/testing/web-platform/tests/.taskcluster.yml b/testing/web-platform/tests/.taskcluster.yml
@@ -557,7 +557,7 @@ wpt
 :
 0
 .
-53
+54
 maxRunTime
 :
 7200
diff --git a/testing/web-platform/tests/docs/running-tests/from-local-system.md b/testing/web-platform/tests/docs/running-tests/from-local-system.md
@@ -26,9 +26,8 @@ the
 tests
 requires
 python
-pip
 and
-virtualenv
+pip
 as
 well
 as
@@ -75,13 +74,10 @@ manager
 to
 install
 python
-pip
 and
-virtualenv
+pip
 .
 On
-Debian
-or
 Ubuntu
 :
 bash
@@ -90,11 +86,13 @@ apt
 -
 get
 install
-python
-python
+python3
+python3
 -
 pip
-virtualenv
+python3
+-
+venv
 It
 is
 important
@@ -153,8 +151,6 @@ be
 used
 while
 pip
-and
-virtualenv
 can
 be
 installed
@@ -191,12 +187,6 @@ base
 /
 bin
 "
-pip
-install
--
--
-user
-virtualenv
 To
 make
 the
@@ -308,14 +298,6 @@ ch000549
 htm
 )
 .
-Finally
-install
-virtualenv
-:
-bash
-pip
-install
-virtualenv
 The
 standard
 Windows
diff --git a/testing/web-platform/tests/tools/ci/tc/tasks/test.yml b/testing/web-platform/tests/tools/ci/tc/tasks/test.yml
@@ -31,7 +31,7 @@ wpt
 :
 0
 .
-53
+54
 maxRunTime
 :
 7200
@@ -498,6 +498,12 @@ python3
 7
 -
 dev
+-
+python3
+.
+7
+-
+venv
 tox
 -
 python3_10
@@ -530,6 +536,12 @@ python3
 10
 -
 dev
+-
+python3
+.
+10
+-
+venv
 tests
 -
 affected
diff --git a/testing/web-platform/tests/tools/docker/Dockerfile b/testing/web-platform/tests/tools/docker/Dockerfile
@@ -138,6 +138,10 @@ python3
 -
 pip
 \
+python3
+-
+venv
+\
 software
 -
 properties
@@ -290,10 +294,6 @@ install
 -
 upgrade
 pip
-RUN
-pip
-install
-virtualenv
 ENV
 TZ
 "
diff --git a/testing/web-platform/tests/tools/wpt/virtualenv.py b/testing/web-platform/tests/tools/wpt/virtualenv.py

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ wpt`
`557`	`557`	`:`
`558`	`558`	`0`
`559`	`559`	`.`
`560`		`-53`
	`560`	`+54`
`561`	`561`	`maxRunTime`
`562`	`562`	`:`
`563`	`563`	`7200`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ wpt`
`31`	`31`	`:`
`32`	`32`	`0`
`33`	`33`	`.`
`34`		`-53`
	`34`	`+54`
`35`	`35`	`maxRunTime`
`36`	`36`	`:`
`37`	`37`	`7200`
`@@ -498,6 +498,12 @@ python3`
`498`	`498`	`7`
`499`	`499`	`-`
`500`	`500`	`dev`
	`501`	`+-`
	`502`	`+python3`
	`503`	`+.`
	`504`	`+7`
	`505`	`+-`
	`506`	`+venv`
`501`	`507`	`tox`
`502`	`508`	`-`
`503`	`509`	`python3_10`
`@@ -530,6 +536,12 @@ python3`
`530`	`536`	`10`
`531`	`537`	`-`
`532`	`538`	`dev`
	`539`	`+-`
	`540`	`+python3`
	`541`	`+.`
	`542`	`+10`
	`543`	`+-`
	`544`	`+venv`
`533`	`545`	`tests`
`534`	`546`	`-`
`535`	`547`	`affected`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,10 @@ python3`
`138`	`138`	`-`
`139`	`139`	`pip`
`140`	`140`	`\`
	`141`	`+python3`
	`142`	`+-`
	`143`	`+venv`
	`144`	`+\`
`141`	`145`	`software`
`142`	`146`	`-`
`143`	`147`	`properties`
`@@ -290,10 +294,6 @@ install`
`290`	`294`	`-`
`291`	`295`	`upgrade`
`292`	`296`	`pip`
`293`		`-RUN`
`294`		`-pip`
`295`		`-install`
`296`		`-virtualenv`
`297`	`297`	`ENV`
`298`	`298`	`TZ`
`299`	`299`	`"`