From c48dd53beae2fd840e771eb5dce5fa0a8e476814 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 18 Mar 2022 12:20:55 +0100
Subject: [PATCH] TST: update tox.ini and remove jsonschame from Dockerfile
---
.docker/Dockerfile | 1 -
tox.ini | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index ca37cc17..7fa7fc1e 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 1b3cd4ef..7b248421 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}
--
GitLab