From 02f8927d9d4cee6002e9d4f425c1bc3ae1aa1de7 Mon Sep 17 00:00:00 2001 From: Florian Spreckelsen <f.spreckelsen@indiscale.com> Date: Thu, 30 Jan 2025 12:38:28 +0100 Subject: [PATCH] PIPELINE: Remove tox from test setup --- .docker/Dockerfile | 3 ++- requirements.txt | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index c2356ab..e1fdffb 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -11,6 +11,7 @@ RUN apt-get update && \ ARG PYLIB RUN echo "PYLIB=${PYLIB}" COPY .docker/wait-for-it.sh /wait-for-it.sh +RUN pip install -r requirements.txt ADD https://gitlab.indiscale.com/api/v4/projects/97/repository/commits/${PYLIB} \ pylib_version.json RUN git clone https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git && \ @@ -31,4 +32,4 @@ CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- \ cp /git/.docker/sss_pylinkahead.ini /scripting/home/.pylinkahead.ini && \ cp -r /git/resources /scripting/bin-debug && \ # ... and run tests - tox + pytest --cov=linkahead -vv {posargs} diff --git a/requirements.txt b/requirements.txt index 93393f0..b30d9a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,6 @@ +jsonschema linkahead -pytest \ No newline at end of file +pytest +pytest-cov +python-dateutil +setuptools -- GitLab