Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit dea7098

Browse files
authored
Update python to 3.8 in dev image (#1256)
* Install python 3.8 for dev image * Upgrade pytest-xdist to 1.31.0
1 parent 70a612b commit dea7098

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

Dockerfile

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,13 +387,16 @@ FROM ubuntu:18.04 as dev-extras
387387

388388
RUN apt update &&\
389389
apt install -y \
390+
build-essential \
390391
curl \
391392
git \
392393
inotify-tools \
393394
iproute2 \
394395
jq \
395396
net-tools \
396-
python3-pip \
397+
python3.8 \
398+
python3.8-dev \
399+
python3.8-distutils \
397400
socat \
398401
sudo \
399402
vim \
@@ -410,15 +413,22 @@ ENV SIGNALFX_BUNDLE_DIR=/bundle \
410413
LC_ALL=C.UTF-8 \
411414
LANG=C.UTF-8
412415

416+
RUN rm -f /usr/bin/python3 && \
417+
ln -s /usr/bin/python3.8 /usr/bin/python && \
418+
ln -s /usr/bin/python3.8 /usr/bin/python3
419+
420+
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
421+
python get-pip.py pip==20.0.2 && \
422+
rm get-pip.py
423+
413424
RUN curl -fsSL get.docker.com -o /tmp/get-docker.sh &&\
414425
sh /tmp/get-docker.sh
415426

416427
# Get integration test deps in here
417428
RUN pip3 install ipython ipdb
418429
COPY tests/requirements.txt /tmp/
419-
RUN pip3 install --upgrade pip==9.0.1 && pip3 install -r /tmp/requirements.txt
420-
RUN ln -s /usr/bin/python3 /usr/bin/python &&\
421-
ln -s /usr/bin/pip3 /usr/bin/pip
430+
RUN pip3 install -r /tmp/requirements.txt
431+
RUN ln -s /usr/bin/pip3 /usr/bin/pip
422432

423433
ARG TARGET_ARCH
424434

tests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ psutil==5.6.6
1010
pylint==2.3.0
1111
pytest-html==1.22
1212
pytest-rerunfailures==4.1
13-
pytest-xdist==1.30.0
13+
pytest-xdist==1.31.0
1414
pytest==5.3.1
1515
redis==2.10.6
1616
requests==2.22.0

0 commit comments

Comments
 (0)