From 2e4633b70452297e57541cb71c2bdf7e457e0773 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 18 Mar 2022 14:48:31 +0100
Subject: [PATCH] MAINT: add jsonschema to normal requirements
---
.docker/Dockerfile | 2 +-
setup.py | 2 +-
tox.ini | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 41e3230e..7fa7fc1e 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 79244b39..2ec401e8 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 7b248421..c0c976fd 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}
--
GitLab