Skip to content
Snippets Groups Projects
Verified Commit 0506e93e authored by Daniel Hornung's avatar Daniel Hornung
Browse files

MAINT: Pipeline optimization

parent 4b6826d0
No related branches found
No related tags found
2 merge requests!128MNT: Added a warning when column metadata is not configured, and a better...,!122Explicit dependencies for testing, documentation, ...
...@@ -2,20 +2,12 @@ FROM debian:11 ...@@ -2,20 +2,12 @@ FROM debian:11
RUN apt-get update && \ RUN apt-get update && \
apt-get install \ apt-get install \
curl \ curl \
libhdf5-dev \
pkgconf \ pkgconf \
python3 \ python3 \
python3-pip \ python3-pip \
python3-requests \
python3-pandas \
python3-html2text \
python3-sphinx \
tox \ tox \
git \ git \
openjdk-11-jdk-headless \ openjdk-11-jdk-headless \
python3-autopep8 \
python3-pytest \
libxml2 \
-y -y
...@@ -23,13 +15,13 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh ...@@ -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 \ ADD https://gitlab.com/api/v4/projects/13656973/repository/branches/dev \
pylib_version.json pylib_version.json
RUN pip install -U pip RUN pip install -U pip
RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \ RUN git clone --depth 1 --branch dev https://gitlab.com/caosdb/caosdb-pylib.git && \
cd caosdb-pylib && git checkout dev && pip install . cd caosdb-pylib && pip install -U .
# At least recommonmark 0.6 required. # 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 COPY . /git
RUN rm -r /git/.git \ RUN rm -r /git/.git \
&& mv /git/.docker/pycaosdb.ini /git/integrationtests && mv /git/.docker/pycaosdb.ini /git/integrationtests
RUN cd /git && pip install .[all] RUN cd /git && pip install -U .[all]
WORKDIR /git/integrationtests WORKDIR /git/integrationtests
CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh --force CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh --force
...@@ -165,6 +165,11 @@ def setup_package(): ...@@ -165,6 +165,11 @@ def setup_package():
], ],
extras_require={"h5": ["h5py>=3.3.0", ], extras_require={"h5": ["h5py>=3.3.0", ],
"gitignore-parser": ["gitignore-parser >=0.1.0", ], "gitignore-parser": ["gitignore-parser >=0.1.0", ],
"dev": [
"autopep8",
"pycodestyle",
"pylint",
],
"doc": [ "doc": [
"sphinx", "sphinx",
"sphinx-autoapi", "sphinx-autoapi",
...@@ -179,7 +184,7 @@ def setup_package(): ...@@ -179,7 +184,7 @@ def setup_package():
"caosadvancedtools[h5, gitignore-parser]", "caosadvancedtools[h5, gitignore-parser]",
], ],
"all": [ # include: doc, test "all": [ # include: doc, test
"caosadvancedtools[doc, test]", "caosadvancedtools[dev, doc, test]",
] ]
}, },
setup_requires=["pytest-runner>=2.0,<3dev"], setup_requires=["pytest-runner>=2.0,<3dev"],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment