From bab0693fc438b5df7e0f0af90b0220db2f5c7cd6 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Thu, 9 Nov 2017 14:42:03 +0100 Subject: [PATCH] contrib: Add py.test to builder Dockerfiles With the previous commit this enables py.test on travis, which should give us some better way of hunting down bugs on travis. Signed-off-by: Christian Decker --- contrib/Dockerfile.builder | 3 ++- contrib/Dockerfile.builder.i386 | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/Dockerfile.builder b/contrib/Dockerfile.builder index 11950f4a5..8b844484d 100644 --- a/contrib/Dockerfile.builder +++ b/contrib/Dockerfile.builder @@ -23,6 +23,7 @@ RUN apt-get -qq update && \ valgrind \ net-tools \ python3-pip \ + python-pkg-resources \ wget && \ rm -rf /var/lib/apt/lists/* @@ -32,4 +33,4 @@ RUN cd /tmp/ && \ mv /tmp/bitcoin-0.15.0/bin/bitcoin* /usr/local/bin/ && \ rm -rf bitcoin.tar.gz /tmp/bitcoin-0.15.0 -RUN pip3 install python-bitcoinlib==0.7.0 +RUN pip3 install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0 diff --git a/contrib/Dockerfile.builder.i386 b/contrib/Dockerfile.builder.i386 index b71fc7bbf..1a91fd9f9 100644 --- a/contrib/Dockerfile.builder.i386 +++ b/contrib/Dockerfile.builder.i386 @@ -23,7 +23,8 @@ RUN apt-get -qq update && \ valgrind \ net-tools \ python3-pip \ - wget && \ + python-pkg-resources \ + wget && \ rm -rf /var/lib/apt/lists/* RUN cd /tmp/ && \ @@ -32,4 +33,4 @@ RUN cd /tmp/ && \ mv /tmp/bitcoin-0.15.0/bin/bitcoin* /usr/local/bin/ && \ rm -rf bitcoin.tar.gz /tmp/bitcoin-0.15.0 -RUN pip3 install python-bitcoinlib==0.7.0 +RUN pip3 install python-bitcoinlib==0.7.0 pytest==3.0.5 setuptools==36.6.0