From ed2ac87cf4be5611f2f7d74723b8199eb62fff8e Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 26 Sep 2019 01:06:38 -0700 Subject: [PATCH] Also moved safety tests to python3 --- tests/safety/Dockerfile | 15 ++++++++++++++- tests/safety/requirements.txt | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/safety/Dockerfile b/tests/safety/Dockerfile index 9381fdc4085759..3f94eda97385c4 100644 --- a/tests/safety/Dockerfile +++ b/tests/safety/Dockerfile @@ -1,6 +1,19 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y clang make python python-pip +RUN apt-get update && apt-get install -y clang make python python-pip git curl locales zlib1g-dev libffi-dev bzip2 libssl-dev libbz2-dev + +RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + +RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash + +ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}" +RUN pyenv install 3.7.3 +RUN pyenv global 3.7.3 +RUN pyenv rehash + COPY tests/safety/requirements.txt /panda/tests/safety/requirements.txt RUN pip install -r /panda/tests/safety/requirements.txt COPY . /panda diff --git a/tests/safety/requirements.txt b/tests/safety/requirements.txt index 8bbfb1d7df38a2..94e97e499f0db7 100644 --- a/tests/safety/requirements.txt +++ b/tests/safety/requirements.txt @@ -1,2 +1,2 @@ cffi==1.11.4 -numpy==1.14.1 +numpy==1.14.5