diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 5e412efcb6bf6c3e0d0ec7ec1f6ffa877190a8fd..03b8278d5b6ddcc21851c2c76917699bf680cf55 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -2,20 +2,12 @@ FROM debian:11 RUN apt-get update && \ apt-get install \ curl \ - libhdf5-dev \ pkgconf \ python3 \ python3-pip \ - python3-requests \ - python3-pandas \ - python3-html2text \ - python3-sphinx \ tox \ git \ openjdk-11-jdk-headless \ - python3-autopep8 \ - python3-pytest \ - libxml2 \ -y @@ -23,13 +15,13 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh ADD https://gitlab.com/api/v4/projects/13656973/repository/branches/dev \ pylib_version.json RUN pip install -U pip -RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \ - cd caosdb-pylib && git checkout dev && pip install . +RUN git clone --depth 1 --branch dev https://gitlab.com/caosdb/caosdb-pylib.git && \ + cd caosdb-pylib && pip install -U . # At least recommonmark 0.6 required. -RUN pip install -U html2text pycodestyle pylint recommonmark sphinx-rtd-theme gitignore-parser +# RUN pip install -U html2text pycodestyle pylint recommonmark sphinx-rtd-theme gitignore-parser COPY . /git RUN rm -r /git/.git \ && mv /git/.docker/pycaosdb.ini /git/integrationtests -RUN cd /git && pip install .[all] +RUN cd /git && pip install -U .[all] 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 747324fbfa5d2748e5703d58665cf366ab242c60..732bbf6190ab788fb91ba8f41c496504ec80cbf7 100755 --- a/setup.py +++ b/setup.py @@ -165,6 +165,11 @@ def setup_package(): ], extras_require={"h5": ["h5py>=3.3.0", ], "gitignore-parser": ["gitignore-parser >=0.1.0", ], + "dev": [ + "autopep8", + "pycodestyle", + "pylint", + ], "doc": [ "sphinx", "sphinx-autoapi", @@ -179,7 +184,7 @@ def setup_package(): "caosadvancedtools[h5, gitignore-parser]", ], "all": [ # include: doc, test - "caosadvancedtools[doc, test]", + "caosadvancedtools[dev, doc, test]", ] }, setup_requires=["pytest-runner>=2.0,<3dev"],