diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 03b8278d5b6ddcc21851c2c76917699bf680cf55..0ce75f43a8e21a6531126c643edfb955c116bd83 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,27 +1,23 @@ -FROM debian:11 +FROM debian:12 RUN apt-get update && \ apt-get install \ - curl \ - pkgconf \ python3 \ python3-pip \ tox \ git \ - openjdk-11-jdk-headless \ -y 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 --depth 1 --branch dev https://gitlab.com/caosdb/caosdb-pylib.git && \ - cd caosdb-pylib && pip install -U . +RUN pip install --break-system-packages -U pip +RUN pip install --break-system-packages -U git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev # At least recommonmark 0.6 required. # 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 -U .[all] +RUN cd /git && pip install --break-system-packages -U .[all] WORKDIR /git/integrationtests CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh --force diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e953065ab3a6359f47a101b64e324fee59c16eb..aeb28ecaaeea47e23b76ec77967f38353f01933e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,14 +123,14 @@ linting: - make lint allow_failure: true -unittest_py39: +unittest_py311: tags: [docker] stage: unittest image: $CI_REGISTRY_IMAGE needs: [build-testenv] script: - # First verify that system Python actually is 3.9 - - python3 -c "import sys; assert sys.version.startswith('3.9')" + # First verify that system Python actually is 3.11 + - python3 -c "import sys; assert sys.version.startswith('3.11')" - python3 -c "import linkahead; print('LinkAhead Version:', linkahead.__version__)" - tox @@ -139,20 +139,20 @@ unittest_py38: stage: unittest image: python:3.8 script: &python_test_script - - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev - - pip install .[all] + - pip install --break-system-packages git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev + - pip install --break-system-packages .[all] - pytest --cov=caosadvancedtools unittests -unittest_py310: +unittest_py39: tags: [docker] stage: unittest - image: python:3.10 + image: python:3.9 script: *python_test_script -unittest_py311: +unittest_py310: tags: [docker] stage: unittest - image: python:3.11 + image: python:3.10 script: *python_test_script unittest_py312: