From 41877a0e763c7035487bb480856f26cb23cfbb68 Mon Sep 17 00:00:00 2001
From: Daniel Hornung <d.hornung@indiscale.com>
Date: Fri, 22 Mar 2024 13:14:20 +0100
Subject: [PATCH] WIP: Better dependency handling.
---
.docker/Dockerfile | 4 ++--
setup.py | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 5b26c03c..a9c05b4a 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -25,10 +25,10 @@ ADD https://gitlab.com/api/v4/projects/13656973/repository/branches/dev \
RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \
cd caosdb-pylib && git checkout dev && pip3 install .
# At least recommonmark 0.6 required.
-RUN pip3 install -U html2text pycodestyle pylint recommonmark sphinx-rtd-theme gitignore-parser
+RUN pip3 install -U pycodestyle pylint 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 .[gitignore-parser,h5-crawler,labfolder]
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 a35bcad4..03e19dd9 100755
--- a/setup.py
+++ b/setup.py
@@ -163,9 +163,11 @@ def setup_package():
"pandas>=1.2.0",
"xlrd>=2.0",
],
- extras_require={"h5-crawler": ["h5py>=3.3.0", ],
- "gitignore-parser": ["gitignore-parser >=0.1.0", ],
- },
+ extras_require={
+ "gitignore-parser": ["gitignore-parser >=0.1.0", ],
+ "h5-crawler": ["h5py>=3.3.0", ],
+ "labfolder": ["bs4", "html2text", ],
+ },
packages=find_packages('src'),
package_dir={'': 'src'},
setup_requires=["pytest-runner>=2.0,<3dev"],
--
GitLab