diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 41e3230e7d29fc5ca759d10edac3cb829b5ba590..7fa7fc1e3ba287611b84d22cd969ef50655f8a8f 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -29,6 +29,6 @@ RUN pip3 install recommonmark sphinx-rtd-theme COPY . /git RUN rm -r /git/.git \ && mv /git/.docker/pycaosdb.ini /git/integrationtests -RUN cd /git && pip3 install .[h5-crawler,data-model-schema] +RUN cd /git && pip3 install .[h5-crawler] WORKDIR /git/integrationtests CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh --force diff --git a/setup.py b/setup.py index 79244b390a3bf7312510b8e51aca9a06b4576f18..2ec401e843df6337b8a2a9e543a986eec8313c3f 100755 --- a/setup.py +++ b/setup.py @@ -159,9 +159,9 @@ def setup_package(): "openpyxl>=3.0.0", "pandas>=1.2.0", "xlrd>=2.0", + "jsonschema>=4.4.0", ], extras_require={"h5-crawler": ["h5py>=3.3.0", ], - "data-model-schema": ["jsonschema>=4.4.0"] }, packages=find_packages('src'), package_dir={'': 'src'}, diff --git a/tox.ini b/tox.ini index 7b248421e7b3b005dceb01e009158293ff3aae2b..c0c976fde9aef8c0883161b3d1b955e2a7919cf1 100644 --- a/tox.ini +++ b/tox.ini @@ -9,5 +9,4 @@ deps=pandas openpyxl xlrd == 1.2 h5py - jsonschema commands=py.test --cov=caosadvancedtools -vv {posargs}