From 6bd1fc1b154130681cf647e22c04fc7ffebacaba Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Wed, 13 Nov 2024 11:31:14 +0100
Subject: [PATCH] Revert "PIPELINE: Fix missing rocrate dependency"
This reverts commit f5947ee963fac47840f01e945c517d2bb0c07d66.
---
.docker/Dockerfile | 3 ---
.gitlab-ci.yml | 4 ----
tox.ini | 2 --
3 files changed, 9 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 066923e6..1468a17f 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -34,9 +34,6 @@ 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 58476b39..e4322356 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,10 +131,6 @@ 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 1b695d26..e003e26e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,8 +9,6 @@ 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}
--
GitLab