Skip to content

Commit dea212b

Browse files
committed
Actually remove six from Dockerfile
With #24484 removing the dependency on system six, we are now able to remove it from the Docker image, which was introduced in #23733. Removing this has the benefit of avoiding introducing accidental dependency.
1 parent 6501773 commit dea212b

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

.taskcluster.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ tasks:
5757
owner: ${owner}
5858
source: ${event.repository.clone_url}
5959
payload:
60-
image: webplatformtests/wpt:0.40
60+
image: webplatformtests/wpt:0.41
6161
maxRunTime: 7200
6262
artifacts:
6363
public/results:

tools/ci/tc/tasks/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ components:
44
workerType: ci
55
schedulerId: taskcluster-github
66
deadline: "24 hours"
7-
image: webplatformtests/wpt:0.40
7+
image: webplatformtests/wpt:0.41
88
maxRunTime: 7200
99
artifacts:
1010
public/results:

tools/docker/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ RUN pip2 install virtualenv
5757
RUN pip3 install --upgrade pip
5858
RUN pip3 install virtualenv
5959

60-
# Ensure we have up-to-date six
61-
RUN pip2 install --upgrade six
62-
RUN pip3 install --upgrade six
63-
6460
ENV TZ "UTC"
6561
RUN echo "${TZ}" > /etc/timezone \
6662
&& dpkg-reconfigure --frontend noninteractive tzdata

0 commit comments

Comments
 (0)