Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47219 )
Change subject: util-docker: Add Python test dependencies to Docker
......................................................................
util-docker: Add Python test dependencies to Docker
These are needed to run our Python tests
Change-Id: Ifd6904a59ad3b6217a337bd5e912c3e7e2e10c17
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47219
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbr...@ucdavis.edu>
Tested-by: kokoro <noreply+kok...@google.com>
---
M util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
M util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
index 775e549..5a9fd8d 100644
--- a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
@@ -31,7 +31,10 @@
RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
python3-dev python3 python3-six doxygen libboost-all-dev \
- libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config
+ libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config \
+ python3-pip python3-venv
+
+RUN pip3 install mypy
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3
10
RUN update-alternatives --install /usr/bin/python python /usr/bin/python2 1
diff --git a/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
b/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
index 3facf7e..76d3011 100644
--- a/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile
@@ -32,4 +32,7 @@
RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
python3-dev python3-six python-is-python3 doxygen libboost-all-dev \
- libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config
+ libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config pip \
+ python3-venv
+
+RUN pip install mypy
\ No newline at end of file
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47219
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ifd6904a59ad3b6217a337bd5e912c3e7e2e10c17
Gerrit-Change-Number: 47219
Gerrit-PatchSet: 5
Gerrit-Owner: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Jason Lowe-Power <power...@gmail.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
