From 0506e93eb8ac7916872c04a566db4174e7aa81a9 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Tue, 26 Nov 2024 13:07:14 +0100
Subject: [PATCH] MAINT: Pipeline optimization
---
.docker/Dockerfile | 16 ++++------------
setup.py | 7 ++++++-
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 5e412efc..03b8278d 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 747324fb..732bbf61 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"],
--
GitLab