diff --git a/.docker/Dockerfile b/.docker/Dockerfile index ca37cc176689ebd41f9af9056bfb3889f71076ac..7fa7fc1e3ba287611b84d22cd969ef50655f8a8f 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -30,6 +30,5 @@ COPY . /git RUN rm -r /git/.git \ && mv /git/.docker/pycaosdb.ini /git/integrationtests RUN cd /git && pip3 install .[h5-crawler] -RUN pip3 install jsonschema WORKDIR /git/integrationtests CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh --force diff --git a/tox.ini b/tox.ini index 1b3cd4ef0d39955197448ace9fdf5d26ea6749b4..7b248421e7b3b005dceb01e009158293ff3aae2b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,12 +2,12 @@ envlist=py36, py37, py38, py39 skip_missing_interpreters = true [testenv] -deps=nose - pandas +deps=pandas git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev pytest pytest-cov openpyxl xlrd == 1.2 h5py + jsonschema commands=py.test --cov=caosadvancedtools -vv {posargs}