From ef20faae141f36795415c3fa15ec22ef5b1b1497 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 18 Mar 2022 13:23:51 +0100
Subject: [PATCH] PIPELINE: update Dockerfile to install extras
---
.docker/Dockerfile | 2 +-
setup.py | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 7fa7fc1e..41e3230e 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 411a5c3d..79244b39 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"],
)
--
GitLab