diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 5b26c03c927780e804f190ee6c8dee1e6813a18e..a9c05b4a20b79ed138491859d7cf6b4ea6244977 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 a35bcad4979ea272c38563cfe89562d814ee5901..03e19dd9a7434fadd64827e73e5fb14cf6a33fb1 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"],