From 13c7e450e5c5c5664dbab4678502217ca3499995 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Fri, 2 Aug 2019 20:28:04 +0800 Subject: [PATCH 1/2] Ignore *.pyc for building test images Signed-off-by: Chenxiong Qi --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index ac48b1cb..5ce6d9ad 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ .tox/ .vagrant/ .vscode/ +**/*.pyc From 51c3b39a521fda666fdb4f9b6cc99b53058a562c Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Fri, 2 Aug 2019 20:28:32 +0800 Subject: [PATCH 2/2] Install pytest<5.0 for building py2 test image Signed-off-by: Chenxiong Qi --- docker/Dockerfile-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-tests b/docker/Dockerfile-tests index 66915e3a..c54d9028 100644 --- a/docker/Dockerfile-tests +++ b/docker/Dockerfile-tests @@ -48,7 +48,7 @@ RUN yum -y install \ && yum clean all # We currently require newer versions of these Python packages for the tests. # more-itertools is required by pytest, but versions 6.0.0 and up aren't Python 2 compatible -RUN pip install --upgrade flask-sqlalchemy pytest flake8 tox pip "more-itertools<6.0.0" +RUN pip install --upgrade flask-sqlalchemy "pytest<5.0" flake8 tox pip "more-itertools<6.0.0" VOLUME /src WORKDIR /src ENTRYPOINT ["docker/test.sh"]