Merge #1368 Ignore *.pyc for building test images and install pytest<5.0 for py2 test image

This commit is contained in:
Jan Kaluža
2019-08-06 11:10:25 +00:00
2 changed files with 2 additions and 1 deletions

View File

@@ -3,3 +3,4 @@
.tox/
.vagrant/
.vscode/
**/*.pyc

View File

@@ -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"]