diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 2a5dc8f54d40b12592781364c33f5c53e25aa776..1e9763f3496c9dca6cc33e6ba8217a654bed487e 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,16 +1,16 @@ -FROM debian:bullseye +FROM debian:bookworm RUN apt-get update && \ apt-get install \ curl \ git \ - openjdk-11-jdk-headless \ + openjdk-17-jdk-headless \ python3-autopep8 \ python3-pip \ python3-pytest \ python3-sphinx \ tox \ -y -RUN pip3 install \ +RUN pip3 install --break-system-packages \ pylint \ recommonmark \ sphinx-rtd-theme \ @@ -20,12 +20,12 @@ ARG PYLIB ADD https://gitlab.indiscale.com/api/v4/projects/97/repository/commits/${PYLIB} \ pylib_version.json RUN git clone https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git && \ - cd caosdb-pylib && git checkout ${PYLIB} && pip3 install . + cd caosdb-pylib && git checkout ${PYLIB} && pip3 install --break-system-packages . ARG ADVANCED ADD https://gitlab.indiscale.com/api/v4/projects/104/repository/commits/${ADVANCED} \ advanced_version.json RUN git clone https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git && \ - cd caosdb-advanced-user-tools && git checkout ${ADVANCED} && pip3 install .[h5-crawler] + cd caosdb-advanced-user-tools && git checkout ${ADVANCED} && pip3 install --break-system-packages .[h5-crawler] COPY . /git # Delete .git because it is huge. @@ -34,7 +34,7 @@ RUN rm -r /git/.git # Install pycaosdb.ini for the tests RUN mv /git/.docker/tester_pycaosdb.ini /git/integrationtests/pycaosdb.ini -RUN cd /git/ && pip3 install .[h5-crawler,spss] +RUN cd /git/ && pip3 install --break-system-packages .[h5-crawler,spss] WORKDIR /git/integrationtests # wait for server, diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b6dca8f47847de85190bf709a8717e8efebe7e6..8812abacc0ef157c418e8f658a4fa7261bb04743 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,12 +113,12 @@ info: script: - *env -unittest_py3.9: +unittest_py3.11: tags: [cached-dind] stage: test image: $CI_REGISTRY_IMAGE script: - - python3 -c "import pyreadstat; print(pyreadstat.__version__)" + - python3 -c "import sys; assert sys.version.startswith('3.11')" - tox unittest_py3.8: @@ -136,16 +136,16 @@ unittest_py3.8: - caosdb-crawler --help - pytest --cov=caosdb -vv ./unittests -unittest_py3.10: +unittest_py3.9: tags: [cached-dind] stage: test - image: python:3.10 + image: python:3.9 script: *python_test_script -unittest_py3.11: +unittest_py3.10: tags: [cached-dind] stage: test - image: python:3.11 + image: python:3.10 script: *python_test_script unittest_py3.12: diff --git a/tox.ini b/tox.ini index 2e1460975ec8e129d5c21887c2f73692ba72f281..41249e4277391c5ffa4ec13fc4da1a6ee1f48491 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ deps = .[h5-crawler,spss] git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@dev commands = caosdb-crawler --help - py.test --cov=caosdb -vv {posargs} + py.test --cov=caoscrawler -vv {posargs} [flake8] max-line-length = 100