Skip to content

Commit

Permalink
python3: move CI over to only python3
Browse files Browse the repository at this point in the history
Change-Id: I07f2475ad5882357fc6ded861cf3d9626602d784
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
  • Loading branch information
geissonator committed Apr 3, 2020
1 parent 8ccdf1b commit 9e5b11f
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions build-unit-test-docker.sh
Expand Up @@ -164,6 +164,8 @@ FROM ${DOCKER_BASE}${DISTRO} as openbmc-base
ENV DEBIAN_FRONTEND noninteractive
ENV PYTHONPATH "/usr/local/lib/python3.7/site-packages/"
# We need the keys to be imported for dbgsym repos
# New releases have a package, older ones fall back to manual fetching
# https://wiki.ubuntu.com/Debug%20Symbol%20Packages
Expand All @@ -187,21 +189,14 @@ RUN apt-get update && apt-get install -yy \
bison \
flex \
cmake \
python \
python-dev \
python-git \
python-yaml \
python-mako \
python-pip \
python-setuptools \
python-socks \
python3 \
python3-dev\
python3-yaml \
python3-mako \
python3-pip \
python3-setuptools \
python3-git \
python3-socks \
pkg-config \
autoconf \
autoconf-archive \
Expand Down Expand Up @@ -250,10 +245,8 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 900 \
--slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 \
--slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9
RUN pip install inflection
RUN pip install pycodestyle
RUN pip install jsonschema
RUN pip3 install inflection
RUN pip3 install pycodestyle
RUN pip3 install jsonschema
RUN pip3 install meson==0.53.2
Expand Down

0 comments on commit 9e5b11f

Please sign in to comment.