diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 1468a17feb16940ae658d3ca6b885af7139ce3d8..066923e6765883752d36f2ba1c349e1cff21b809 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -34,6 +34,9 @@ RUN rm -r /git/.git # Install pycaosdb.ini for the tests RUN mv /git/.docker/tester_pycaosdb.ini /git/integrationtests/pycaosdb.ini +# TODO Remove once https://github.com/ResearchObject/ro-crate-py/issues/203 has been resolved. +RUN pip3 install --break-system-packages git+https://github.com/salexan2001/ro-crate-py.git@f-automatic-dummy-ids + RUN cd /git/ && pip3 install --break-system-packages .[h5-crawler,spss,rocrate] WORKDIR /git/integrationtests diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e43223568252b2e7a1504610692fe20dc9d78348..58476b391235eea3b8fff018dd361317fa5d3b83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,6 +131,10 @@ unittest_py3.9: # TODO: Use f-branch logic here - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@dev + # TODO: Remove once + # https://github.com/ResearchObject/ro-crate-py/issues/203 has + # been resolved. + - pip install git+https://github.com/salexan2001/ro-crate-py.git@f-automatic-dummy-ids - pip install .[h5-crawler,spss,rocrate] # actual test - caosdb-crawler --help diff --git a/tox.ini b/tox.ini index e003e26ecd16861c3b8a8d991fc789c78d203e5b..1b695d26c56e1e251404700cfd04fb50a7dc0d8d 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,8 @@ deps = .[h5-crawler,spss,rocrate] # TODO: Make this f-branch sensitive git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@dev + # TODO Remove once https://github.com/ResearchObject/ro-crate-py/issues/203 has been resolved. + git+https://github.com/salexan2001/ro-crate-py.git@f-automatic-dummy-ids commands = caosdb-crawler --help py.test --cov=caoscrawler -vv {posargs}