PyGObject 3.49.0.dev0__tar.gz → 3.51.0.dev0__tar.gz

pygobject-3.51.0.dev0/.clang-format

@@ -0,0 +1,198 @@
+---
+# Reference: https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+Language: Cpp
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: AcrossEmptyLines
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: Consecutive
+AlignEscapedNewlines: Right
+AlignOperands: Align
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 1
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowBreakBeforeNoexceptSpecifier: OnlyWithParen
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseExpressionOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortCompoundRequirementOnASingleLine: true
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: None
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterExternBlock: false
+  AfterFunction: true
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  BeforeCatch: true
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakAdjacentStringLiterals: true
+BreakAfterAttributes: Leave
+BreakAfterReturnType: AllDefinitions
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Custom
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakFunctionDefinitionParameters: false
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+BreakTemplateDeclarations: Yes
+ColumnLimit: 79
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+FixNamespaceComments: true
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^[<"]Python\.h[">]$'
+    Priority: 2
+    CaseSensitive: true
+  - Regex: '^<[[:alnum:]_/]+(\.h)?>$'
+    Priority: 1
+  - Regex: '.*'
+    Priority: 3
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentExternBlock: NoIndent
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentRequiresClause: true
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+InsertBraces: false
+InsertNewlineAtEOF: true
+InsertTrailingCommas: None
+KeepEmptyLines:
+  AtEndOfFile: false
+  AtStartOfBlock: false
+  AtStartOfFile: false
+LambdaBodyIndentation: Signature
+LineEnding: DeriveLF
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+Macros:
+  - >-
+    PyObject_HEAD_INIT(type)={
+        /* this is not exactly match with PyObject_HEAD_INIT in Python source code
+         * but it is enough for clang-format */
+        { 0xFFFFFFFF },
+        (type)
+    },
+  - >-
+    PyVarObject_HEAD_INIT(type, size)={
+        {
+            /* manually expand PyObject_HEAD_INIT(type) above
+             * because clang-format do not support recursive expansion */
+            { 0xFFFFFFFF },
+            (type)
+        },
+        (size)
+    },
+  - PyMODINIT_FUNC=PyObject *
+  - _PyGI_ENUM_BEGIN(name)={
+  - _PyGI_ENUM_ADD_VALUE(prefix, name)=(prefix##_##name);
+  - _PyGI_ENUM_END=}
+MainIncludeChar: Quote
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+PackConstructorInitializers: NextLine
+PenaltyBreakAssignment: 20
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakScopeResolution: 500
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 1000000000
+PointerAlignment: Right
+PPIndentWidth: -1
+QualifierAlignment: Custom
+QualifierOrder:
+  [friend, static, inline, const, constexpr, volatile, type, restrict]
+ReferenceAlignment: Right
+ReflowComments: false
+RemoveBracesLLVM: false
+RemoveParentheses: MultipleParentheses
+RemoveSemicolon: true
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SkipMacroDefinitionBody: false
+SortIncludes: CaseSensitive
+SortUsingDeclarations: LexicographicNumeric
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeJsonColon: false
+SpaceBeforeParens: Always
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: Never
+SpacesInContainerLiterals: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+SpacesInParens: Never
+SpacesInSquareBrackets: false
+Standard: c++11
+StatementAttributeLikeMacros:
+StatementMacros:
+  - PyObject_HEAD
+TableGenBreakInsideDAGArg: DontBreak
+TabWidth: 4
+TypeNames:
+  # Defined in Include/pytypedefs.h
+  - PyModuleDef
+  - PyModuleDef_Slot
+  - PyMethodDef
+  - PyGetSetDef
+  - PyMemberDef
+  - PyObject
+  - PyLongObject
+  - PyTypeObject
+  - PyThreadState
+  - PyInterpreterState
+UseTab: Never

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitignore

@@ -19,15 +19,16 @@
 .idea
 .cache
 .pytest_cache
-/config.h
 /tmp/*
 /build/
 /dist/
 /pygobject.egg-info/
 /docs/_build
 /PyGObject.egg-info/
+/subprojects/*/
+!/subprojects/packagefiles/
 *.pyd
 *.dll.a
 .coverage
 pdm.lock
-.pdm-python
+.pdm-python

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitlab-ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -8,6 +8,8 @@ RUN apt-get update && apt-get install -y \
     ccache \
     curl \
     dbus \
+    gir1.2-freedesktop-dev \
+    gir1.2-girepository-3.0-dev \
     gir1.2-gtk-3.0 \
     gir1.2-gtk-4.0 \
     git \
@@ -16,7 +18,7 @@ RUN apt-get update && apt-get install -y \
     libbz2-dev \
     libcairo2-dev \
     libffi-dev \
-    libgirepository1.0-dev \
+    libgirepository-2.0-dev \
     libglib2.0-dev \
     libgtk-3-0 \
     libgtk-4-1 \
@@ -34,36 +36,37 @@ RUN apt-get update && apt-get install -y \
 RUN add-apt-repository -y ppa:pypy/ppa \
     && apt-get update \
     && apt-get install -y pypy3 pypy3-dev pypy3-venv \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && sed -i 's#/build/pypy3-[^/]*/[^/]*#/usr#g' /usr/lib/pypy3.*/_sysconfigdata__x86_64-linux-gnu.py
 
 ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+ENV HOST_USER_ID=${HOST_USER_ID}
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user \
+    && echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 USER user
 WORKDIR /home/user
 
-ENV LANG C.UTF-8
-ENV CI true
-ENV PYENV_ROOT /home/user/.pyenv
+ENV LANG=C.UTF-8
+ENV CI=true
+ENV PYENV_ROOT=/home/user/.pyenv
 ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}"
 ENV PYTHON_CONFIGURE_OPTS="--enable-shared"
 
 # https://github.com/pyenv/pyenv/releases
-ENV PYENV_GIT_TAG v2.3.31
+ENV PYENV_GIT_TAG=v2.4.17
 RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
 
 # Register the pypy3 system installation
-RUN mkdir -p "${PYENV_ROOT}/versions/pypy3-system/bin/"
-RUN sudo ln -s /usr/bin/pypy3 "${PYENV_ROOT}/versions/pypy3-system/bin/python"
-RUN pyenv rehash
+RUN mkdir -p "${PYENV_ROOT}/versions/pypy3-system/bin/" \
+    && sudo ln -s /usr/bin/pypy3 "${PYENV_ROOT}/versions/pypy3-system/bin/python" \
+    && pyenv rehash
 
-RUN pyenv install --debug 3.8
 RUN pyenv install --debug 3.9
 RUN pyenv install --debug 3.10
 RUN pyenv install --debug 3.11
 RUN pyenv install --debug 3.12
+RUN pyenv install --debug 3.13
 
 ENV PATH="/usr/lib/ccache:${PATH}"
 

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitlab-ci/build-sdists.sh

@@ -4,6 +4,7 @@ set -e
 
 rm -Rf _venv_sdist
 python3 -m venv _venv_sdist
+# shellcheck disable=SC1091
 source _venv_sdist/bin/activate
 mkdir -p dist
 
@@ -11,18 +12,20 @@ mkdir -p dist
 python -m pip install --upgrade meson pycairo
 rm -Rf _sdist_build
 meson setup _sdist_build
-meson dist --no-tests --allow-dirty -C _sdist_build
-mv _sdist_build/meson-dist/*.tar.xz dist/
+meson dist --no-tests --allow-dirty --include-subprojects -C _sdist_build
+cp _sdist_build/meson-dist/*.tar.xz dist/
 
-VERSION=$(meson introspect --projectinfo --indent _sdist_build | awk -F'"' '/version/ { print $4 }')
+[ -n "${TARBALL_ARTIFACT_PATH}" ] && cp _sdist_build/meson-dist/*.tar.xz "${TARBALL_ARTIFACT_PATH}"
+
+VERSION=$(meson introspect --projectinfo --indent _sdist_build | python -c 'import json, sys; print(json.load(sys.stdin)["version"])')
 
 rm -Rf _sdist_build
 
 # Now the sdist for pypi
 # Mark odd versions as PEP440 development versions (e.g. 0.1.0 -> 0.1.0.dev0)
-[[ "$VERSION" =~ ^[0-9]\.[0-9]*[13579]\. ]] && meson rewrite kwargs set project / version ${VERSION}.dev0
+[[ "$VERSION" =~ ^[0-9]\.[0-9]*[13579]\. ]] && meson rewrite kwargs set project / version "${VERSION}".dev0
 
 python -m pip install --upgrade build
 python -m build --sdist
 
-meson rewrite kwargs set project / version ${VERSION}
+meson rewrite kwargs set project / version "${VERSION}"

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitlab-ci/coverage-docker.sh

@@ -10,13 +10,17 @@ for path in coverage/*.lcov; do
     lcov --config-file .gitlab-ci/lcovrc -r "${path}" '/usr/include/*' -o "${path}"
     lcov --config-file .gitlab-ci/lcovrc -r "${path}" '/home/*' -o "${path}"
     lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*/msys64/*' -o "${path}"
+    lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*site-packages/*' -o "${path}"
     lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*subprojects/*' -o "${path}"
     lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*tmp-introspect*' -o "${path}"
+    lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*/meson-private/*' -o "${path}"
+
+    test -s "${path}" || rm "${path}"
 done
 
-genhtml --ignore-errors=source --config-file .gitlab-ci/lcovrc \
+genhtml --config-file .gitlab-ci/lcovrc \
     coverage/*.lcov -o coverage/
 
 cd coverage
 rm -f .coverage*
-rm -f *.lcov
+rm -f ./*.lcov

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitlab-ci/lcovrc

@@ -4,6 +4,8 @@
 # Always enable branch coverage
 lcov_branch_coverage = 1
 
+stop_on_error = 0
+
 # Exclude precondition assertions, as we can never reasonably get full branch
 # coverage of them, as they should never normally fail.
 # See https://github.com/linux-test-project/lcov/issues/44

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitlab-ci/run-docker.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v23"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v25"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .

pygobject-3.51.0.dev0/.gitlab-ci/test-docker.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+python --version
+
+SOURCE_DIR="$(pwd)"
+COV_DIR="${SOURCE_DIR}/coverage"
+COV_KEY="${CI_JOB_NAME_SLUG}"
+JUNIT_XML="${SOURCE_DIR}/test-results.xml"
+
+CFLAGS="-coverage -ftest-coverage -fprofile-arcs -Werror"
+MALLOC_CHECK_=3
+MALLOC_PERTURB_=$((RANDOM % 255 + 1))
+G_SLICE="debug-blocks"
+COVERAGE_FILE="${COV_DIR}/.coverage.${COV_KEY}"
+CCACHE_BASEDIR="$(pwd)"
+CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+export CFLAGS MALLOC_CHECK_ MALLOC_PERTURB_ G_SLICE COVERAGE_FILE \
+       CCACHE_BASEDIR CCACHE_DIR
+
+# https://docs.python.org/3/using/cmdline.html#envvar-PYTHONDEVMODE
+export PYTHONDEVMODE=1
+export MESONPY_EDITABLE_VERBOSE=1
+
+mkdir -p "${CCACHE_DIR}"
+mkdir -p "${COV_DIR}"
+
+python -m venv /tmp/venv
+# shellcheck disable=SC1091
+source /tmp/venv/bin/activate
+
+python -m pip install --upgrade pip
+python -m pip install meson meson-python pycairo pytest pytest-cov
+
+# BUILD & TEST
+python -m pip install --config-settings=setup-args="-Dtests=true" --no-build-isolation --editable .
+
+# TEST
+lcov --config-file .gitlab-ci/lcovrc --directory . --capture --initial --output-file \
+    "${COV_DIR}/${CI_JOB_NAME_SLUG}-baseline.lcov"
+
+xvfb-run -a python -m pytest -vs --cov --junit-xml="${JUNIT_XML}"
+python -m coverage lcov -o "${COV_DIR}/${COV_KEY}.py.lcov"
+
+# COLLECT GCOV COVERAGE
+lcov --config-file .gitlab-ci/lcovrc --directory . --capture --output-file \
+    "${COV_DIR}/${CI_JOB_NAME_SLUG}.lcov"

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitlab-ci/test-flatpak.sh

@@ -7,7 +7,8 @@ DIR="$( cd "$( dirname "$0" )" && pwd )"
 if [[ "$1" == "inflatpak" ]]; then
     COV_DIR="$(pwd)/coverage"
     COV_KEY="flatpak-$TEST_GTK_VERSION"
-    export COVERAGE_FILE="${COV_DIR}/.coverage.${COV_KEY}"
+    COVERAGE_FILE="${COV_DIR}/.coverage.${COV_KEY}"
+    export COVERAGE_FILE
     mkdir -p "${COV_DIR}"
 
     python3 --version
@@ -19,6 +20,7 @@ if [[ "$1" == "inflatpak" ]]; then
     chmod -R 777 "${COV_DIR}"
 else
     # https://gitlab.gnome.org/GNOME/gnome-runtime-images/-/issues/7
-    export DBUS_SYSTEM_BUS_ADDRESS="$(dbus-daemon --session --print-address --fork)"
+    DBUS_SYSTEM_BUS_ADDRESS="$(dbus-daemon --session --print-address --fork)"
+    export DBUS_SYSTEM_BUS_ADDRESS
     xvfb-run -a flatpak run --user --filesystem=host --share=network --socket=x11 --command=bash org.gnome.Sdk//master -x "${DIR}"/test-flatpak.sh inflatpak
 fi

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitlab-ci/test-msys2.sh

@@ -24,28 +24,33 @@ pacman --noconfirm -S --needed \
 # ccache setup
 export PATH="$MSYSTEM/lib/ccache/bin:$PATH"
 mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+CCACHE_BASEDIR="$(pwd)"
+export CCACHE_BASEDIR
+CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+export CCACHE_DIR
 
 # coverage setup
 COV_DIR="$(pwd)/coverage"
-COV_KEY="${CI_JOB_NAME}"
+COV_KEY="${CI_JOB_NAME_SLUG}"
 mkdir -p "${COV_DIR}"
 export COVERAGE_FILE="${COV_DIR}/.coverage.${COV_KEY}"
 
+# Test results
+JUNIT_XML="test-results.xml"
+
 # https://docs.python.org/3/using/cmdline.html#envvar-PYTHONDEVMODE
 export PYTHONDEVMODE=1
 
 
-MSYSTEM= CFLAGS="-coverage -ftest-coverage -fprofile-arcs -Werror" meson setup _build
+MSYSTEM='' CFLAGS="-coverage -ftest-coverage -fprofile-arcs -Werror" meson setup _build
 
 lcov \
     --config-file .gitlab-ci/lcovrc \
     --directory "$(pwd)" --capture --initial --output-file \
     "${COV_DIR}/${COV_KEY}-baseline.lcov"
 
-MSYSTEM= PYTEST_ADDOPTS="--cov" meson test --suite pygobject --timeout-multiplier 4 -C _build -v
-MSYSTEM= python -m coverage lcov -o "${COV_DIR}/${COV_KEY}.py.lcov"
+MSYSTEM='' PYTEST_ADDOPTS="--cov -sv --junit-xml=${JUNIT_XML}" meson test --suite pygobject --timeout-multiplier 4 -C _build -v
+MSYSTEM='' python -m coverage lcov -o "${COV_DIR}/${COV_KEY}.py.lcov"
 
 lcov \
     --config-file .gitlab-ci/lcovrc \

{pygobject-3.49.0.dev0 → pygobject-3.51.0.dev0}/.gitlab-ci.yml

@@ -1,29 +1,79 @@
-image: registry.gitlab.gnome.org/gnome/pygobject/main:v23
-
+include:
+  - component: gitlab.gnome.org/GNOME/citemplates/release-service@master
+    inputs:
+      dist-job-name: "sdist"
+      tarball-artifact-path: "${TARBALL_ARTIFACT_PATH}"
+      
 stages:
+  - pre-commit
   - build_and_test
   - coverage
   - deploy
 
-cache:
-  paths:
-    - _ccache/
+variables:
+  TARBALL_ARTIFACT_PATH: "dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.xz"
+
+default:
+  image: registry.gitlab.gnome.org/gnome/pygobject/main:v26
+  cache:
+    paths:
+      - _ccache/
 
-.defaults: &defaults
+pre-commit:
+  stage: pre-commit
+  variables:
+    PYTHON_VERSION: "3.13"
+    XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"
+  script:
+    - git config --global --add safe.directory "$CI_PROJECT_DIR"
+    - python -m pip install -q pre-commit
+    - python -m pre_commit run --all-files
+  artifacts:
+    when: on_failure
+    paths:
+      - .cache/pre-commit/pre-commit.log
+
+linux:
   stage: build_and_test
+  parallel:
+    matrix:
+      - PYTHON_VERSION:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+          - "pypy3"
+        TEST_GTK_VERSION: "3.0"
+      - PYTHON_VERSION: "3.11"
+        TEST_GTK_VERSION: "4.0"
   artifacts:
+    when: always
     paths:
       - coverage/
+      - test-results.xml
+    reports:
+      junit: test-results.xml
   script:
    - bash -x ./.gitlab-ci/test-docker.sh
 
-.mingw-defaults: &mingw-defaults
+windows:
   stage: build_and_test
   tags:
     - win32-ps
+  parallel:
+    matrix:
+      - MSYSTEM:
+          - "MINGW32"
+          - "MINGW64"
   artifacts:
+    when: always
     paths:
       - coverage/
+      - _build/meson-logs
+      - test-results.xml
+    reports:
+      junit: test-results.xml
   script:
     - $env:CHERE_INVOKING = 'yes'
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
@@ -54,8 +104,8 @@ pages:
     paths:
       - public
     expire_in: 30 days
-  only:
-    - main
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
 
 sdist:
   stage: build_and_test
@@ -66,91 +116,19 @@ sdist:
     - git config --global --add safe.directory "$CI_PROJECT_DIR"
     - bash -x ./.gitlab-ci/build-sdists.sh
 
-mingw32:
-  variables:
-    MSYSTEM: "MINGW32"
-  <<: *mingw-defaults
-
-mingw64:
-  variables:
-    MSYSTEM: "MINGW64"
-  <<: *mingw-defaults
-
-python3.9:
-  variables:
-    PYTHON_VERSION: "3.9"
-    TEST_GTK_VERSION: "3.0"
-  <<: *defaults
-
-python3.10:
-  variables:
-    PYTHON_VERSION: "3.10"
-    TEST_GTK_VERSION: "3.0"
-  <<: *defaults
-
-python3.11:
-  variables:
-    PYTHON_VERSION: "3.11"
-    TEST_GTK_VERSION: "3.0"
-  <<: *defaults
-
-python3.11-gtk4:
-  variables:
-    PYTHON_VERSION: "3.11"
-    TEST_GTK_VERSION: "4.0"
-  <<: *defaults
-
-python3.12:
-  variables:
-    PYTHON_VERSION: "3.12"
-    TEST_GTK_VERSION: "3.0"
-  <<: *defaults
-
-pypy3:
-  variables:
-    PYTHON_VERSION: "pypy3"
-    TEST_GTK_VERSION: "3.0"
-  <<: *defaults
-
-old-i386-py3:
-  stage: build_and_test
-  image: registry.gitlab.gnome.org/gnome/pygobject/old:v6
-  artifacts:
-    paths:
-      - coverage/
-  script:
-   - bash -x ./.gitlab-ci/test-docker-old.sh
-  # This build sometimes fails with message:
-  #   ninja: error: loading 'build.ninja': Value too large for defined data type
-  retry:
-    max: 2
-    when: runner_system_failure
-    exit_codes: 1
-
 gnome-master:
   stage: build_and_test
   image: quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master
   tags:
     - flatpak
+  parallel:
+    matrix:
+      - TEST_GTK_VERSION:
+          - "3.0"
+          - "4.0"
   artifacts:
     paths:
       - coverage/
-  variables:
-    TEST_GTK_VERSION: "3.0"
-  script:
-    - bash -x ./.gitlab-ci/test-flatpak.sh
-
-gnome-master-gtk4:
-  allow_failure: true
-  stage: build_and_test
-  image: quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master
-  tags:
-    - flatpak
-  artifacts:
-    paths:
-      - coverage/
-  variables:
-    TEST_GTK_VERSION: "4.0"
   script:
     - bash -x ./.gitlab-ci/test-flatpak.sh
 
@@ -168,10 +146,10 @@ python3.12-pdm:
 minimal-meson:
   allow_failure: true
   stage: build_and_test
-  image: quay.io/fedora/fedora:39 
+  image: quay.io/fedora/fedora:40
   before_script:
-    - dnf install --assumeyes gcc meson git flex bison diffutils python3-devel python3-pytest
+    - dnf install --assumeyes gcc meson git flex bison diffutils python3-devel python3-pytest gobject-introspection-devel
   script:
     - meson setup _build
     - meson compile -C _build
-    - PYTEST_ADDOPTS="-k 'not test_cairo'" meson test -C _build --verbose
+    - PYTEST_ADDOPTS="-sv -k 'not test_cairo'" meson test -C _build --suite pygobject --verbose

pygobject-3.51.0.dev0/.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+# This is a configuration file for the pre-commit tool.
+# Documentation is available at https://pre-commit.com/#plugins
+
+repos:
+- repo: https://github.com/shellcheck-py/shellcheck-py
+  rev: a23f6b85d0fdd5bb9d564e2579e678033debbdff  # frozen: v0.10.0.1
+  hooks:
+  - id: shellcheck
+- repo: https://github.com/PyCQA/flake8
+  rev: 7.1.1
+  hooks:
+  - id: flake8