diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 7fa7fc1e3ba287611b84d22cd969ef50655f8a8f..270ed88f3e32fc170f7cdb34ecb59e6ed7741211 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -25,7 +25,7 @@ ADD https://gitlab.com/api/v4/projects/13656973/repository/branches/dev \ RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \ cd caosdb-pylib && git checkout dev && pip3 install . # At least recommonmark 0.6 required. -RUN pip3 install recommonmark sphinx-rtd-theme +RUN pip3 install html2text pycodestyle pylint recommonmark sphinx-rtd-theme COPY . /git RUN rm -r /git/.git \ && mv /git/.docker/pycaosdb.ini /git/integrationtests diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b8e8ac1c2b6e01260a07eec17ecb25d4b06fe88..8ebbefaa39650ddaff45b856a8a4d44a2ac495d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,7 +109,7 @@ style: tags: [docker] stage: style image: $CI_REGISTRY_IMAGE - needs: [] + needs: [build-testenv] script: - make style allow_failure: true @@ -118,7 +118,7 @@ linting: tags: [docker] stage: style image: $CI_REGISTRY_IMAGE - needs: [] + needs: [build-testenv] script: - make lint allow_failure: true @@ -127,7 +127,7 @@ unittest: tags: [docker] stage: unittest image: $CI_REGISTRY_IMAGE - needs: [] + needs: [build-testenv] script: - tox