diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2023-03-19 10:54:09 +0100 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2023-03-19 11:23:30 +0100 |
| commit | f821dbb599c67a2fa0d349b24f23bb6b8855368f (patch) | |
| tree | f5796919f6d11d3deae6fdfae645781932cfd528 /.gitlab-ci | |
| parent | 960ef271edf9e6968d8c1d46bc8652576cd762c1 (diff) | |
| download | pygobject-f821dbb599c67a2fa0d349b24f23bb6b8855368f.tar.gz | |
Drop Python 3.7 support and update CI envs
Python 3.7 will be EOL in 3 months, so before the next release.
* Update the Python versions in the CI images
* Bump the docker base image from focal to jammy to test against a newer stack.
This triggers new deprecation warnings which we need to disable for now.
* Bump the old docker based image to from buster to bullseye, moving
from Python 3.7 to 3.9.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 7 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.old | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker-old.sh | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/test-docker.sh | 3 |
5 files changed, 10 insertions, 8 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 5883d913..6af00202 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal +FROM ubuntu:jammy ENV DEBIAN_FRONTEND=noninteractive @@ -43,10 +43,9 @@ ENV PYTHON_CONFIGURE_OPTS="--enable-shared" RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash RUN pyenv install pypy3.8-7.3.11 -RUN pyenv install --debug 3.7.16 RUN pyenv install --debug 3.8.16 RUN pyenv install --debug 3.9.16 -RUN pyenv install --debug 3.10.9 -RUN pyenv install --debug 3.11.1 +RUN pyenv install --debug 3.10.10 +RUN pyenv install --debug 3.11.2 ENV PATH="/usr/lib/ccache:${PATH}" diff --git a/.gitlab-ci/Dockerfile.old b/.gitlab-ci/Dockerfile.old index 3e7b8f82..6387ffa5 100644 --- a/.gitlab-ci/Dockerfile.old +++ b/.gitlab-ci/Dockerfile.old @@ -1,4 +1,4 @@ -FROM i386/debian:buster +FROM i386/debian:bullseye ENV DEBIAN_FRONTEND=noninteractive diff --git a/.gitlab-ci/run-docker-old.sh b/.gitlab-ci/run-docker-old.sh index 32b37156..3663cfe7 100755 --- a/.gitlab-ci/run-docker-old.sh +++ b/.gitlab-ci/run-docker-old.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/pygobject/old:v5" +TAG="registry.gitlab.gnome.org/gnome/pygobject/old:v6" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile.old" . diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index cf30c2d3..77243dac 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,10 +2,10 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v19" +TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v20" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . -sudo docker run -e PYENV_VERSION='3.8.16-debug' --rm --security-opt label=disable \ +sudo docker run -e PYENV_VERSION='3.9.16-debug' --rm --security-opt label=disable \ --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ --tty --interactive "${TAG}" bash diff --git a/.gitlab-ci/test-docker.sh b/.gitlab-ci/test-docker.sh index d44641dd..1d1a1a64 100755 --- a/.gitlab-ci/test-docker.sh +++ b/.gitlab-ci/test-docker.sh @@ -26,6 +26,9 @@ python -m pip install pycairo flake8 pytest pytest-faulthandler coverage export CFLAGS="-coverage -ftest-coverage -fprofile-arcs -Werror" +# FIXME: g_callable_info_free_closure etc +CFLAGS+=" -Wno-error=deprecated-declarations" + # MESON /usr/bin/python3 -m pip install --user meson export PATH="${HOME}/.local/bin:${PATH}" |