diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 7fa7fc1e3ba287611b84d22cd969ef50655f8a8f..41e3230e7d29fc5ca759d10edac3cb829b5ba590 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] +RUN cd /git && pip3 install .[h5-crawler,data-model-schema] 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 411a5c3dcd6ba362e7e7c8e6015e103acdf5bd31..79244b390a3bf7312510b8e51aca9a06b4576f18 100755 --- a/setup.py +++ b/setup.py @@ -161,9 +161,13 @@ def setup_package(): "xlrd>=2.0", ], extras_require={"h5-crawler": ["h5py>=3.3.0", ], + "data-model-schema": ["jsonschema>=4.4.0"] }, packages=find_packages('src'), package_dir={'': 'src'}, + package_data={ + 'caosadvancedtools': ['models/schema-model.yml'], + }, setup_requires=["pytest-runner>=2.0,<3dev"], tests_require=["pytest", "pytest-pythonpath", "pytest-cov", "coverage>=4.4.2"], )