PyGObject 3.49.0.dev0__tar.gz → 3.50.1__tar.gz

pygobject-3.50.1/.flake8

@@ -0,0 +1,3 @@
+[flake8]
+ignore=E501,E123,E124,E402,E731,E722,W504,F824
+exclude=subprojects,build,.venv

pygobject-3.50.1/.gitlab-ci/build-sdists.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+python -m pip install --upgrade pdm
+python -m pdm build
+
+VERSION=$(grep version meson.build | head -1 | sed "s/^.*'\([0-9\.]*\)'.*$/\1/")
+
+if [[ "$VERSION" =~ ^[0-9]\.[0-9]*[13579]\. ]]
+then
+cat << EOF
+
+****************** ATTENTION ******************
+          This is an UNstable release.
+       Do NOT upload this release to PyPI.
+****************** ATTENTION ******************
+
+EOF
+fi

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

@@ -24,28 +24,34 @@ 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='' meson compile -C _build -v
+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.50.1}/.gitlab-ci.yml

@@ -1,29 +1,63 @@
-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:
   - build_and_test
   - coverage
   - deploy
 
-cache:
-  paths:
-    - _ccache/
+variables:
+  TARBALL_ARTIFACT_PATH: "dist/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.gz"
 
-.defaults: &defaults
+default:
+  image: registry.gitlab.gnome.org/gnome/pygobject/main:v23
+  cache:
+    paths:
+      - _ccache/
+
+linux:
   stage: build_and_test
+  parallel:
+    matrix:
+      - PYTHON_VERSION:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "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 +88,9 @@ pages:
     paths:
       - public
     expire_in: 30 days
-  only:
-    - main
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_COMMIT_TAG
 
 sdist:
   stage: build_and_test
@@ -66,91 +101,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 +131,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.49.0.dev0 → pygobject-3.50.1}/NEWS

@@ -1,3 +1,14 @@
+3.50.1 - 2025-05-25
+-------------------
+
+* Backport: Fix event loop selector with Python 3.13 :mr:`423`
+
+3.50.0 - 2024-09-12
+-------------------
+
+* tests: Fix event test errors when GTK is not installed :mr:`347`
+
+
 3.49.0 - 2024-09-06 (pre-release)
 ---------------------------------
 

{pygobject-3.49.0.dev0 → pygobject-3.50.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyGObject
-Version: 3.49.0.dev0
+Version: 3.50.1
 Summary: Python bindings for GObject Introspection
 Author-Email: James Henstridge <james@daa.com.au>
 Maintainer-Email: Christoph Reiter <creiter@src.gnome.org>, Arjan Molenaar <amolenaar@gnome.org>, Dan Yeaw <danyeaw@gnome.org>, Ignacio Casal Quinteiro <icq@gnome.org>

{pygobject-3.49.0.dev0 → pygobject-3.50.1}/gi/events.py

@@ -28,6 +28,7 @@ import threading
 import selectors
 import weakref
 import warnings
+from collections.abc import Mapping
 from contextlib import contextmanager
 from . import _ossighelper
 
@@ -381,9 +382,33 @@ if sys.platform != 'win32':
         # Subclass to attach _tag
         pass
 
+    class _FileObjectMapping(Mapping):
+        def __init__(self, fd_dict):
+            self.fd_dict = fd_dict
+
+        def __len__(self):
+            return len(self.fd_dict)
+
+        def get(self, fileobj, default=None):
+            fd = _fileobj_to_fd(fileobj)
+            return self.fd_dict.get(fd, default)
+
+        def __getitem__(self, fileobj):
+            value = self.get(fileobj)
+            if value is None:
+                raise KeyError("{!r} is not registered".format(fileobj))
+            return value
+
+        def __iter__(self):
+            return iter(self.fd_dict)
+
     class _Selector(_SelectorMixin, selectors.BaseSelector):
         """A Selector for gi.events.GLibEventLoop registering python IO with GLib."""
 
+        def __init__(self, context, loop):
+            super().__init__(context, loop)
+            self._map = _FileObjectMapping(self._fd_to_key)
+
         def attach(self):
             self._source.attach(self._loop._context)
 
@@ -407,7 +432,9 @@ if sys.platform != 'win32':
                 raise ValueError("Invalid events: {!r}".format(events))
 
             fd = _fileobj_to_fd(fileobj)
-            assert fd not in self._fd_to_key
+            if fd in self._fd_to_key:
+                raise KeyError("{!r} (FD {}) is already registered"
+                               .format(fileobj, fd))
 
             key = _SelectorKey(fileobj, fd, events, data)
 
@@ -430,15 +457,12 @@ if sys.platform != 'win32':
         # We could override modify, but it is only slightly when the "events" change.
 
         def get_key(self, fileobj):
-            fd = _fileobj_to_fd(fileobj)
-            return self._fd_to_key[fd]
+            return self._map[fileobj]
 
         def get_map(self):
-            """Return a mapping of file objects to selector keys."""
-            # Horribly inefficient
-            # It should never be called and exists just to prevent issues if e.g.
-            # python decides to use it for debug purposes.
-            return {k.fileobj: k for k in self._fd_to_key.values()}
+            """Return a mapping of file objects or file descriptors to
+            selector keys."""
+            return self._map
 
 
 else:

{pygobject-3.49.0.dev0 → pygobject-3.50.1}/meson.build

@@ -1,7 +1,7 @@
 project(
   'pygobject',
   'c',
-version : '3.49.0.dev0',
+  version : '3.50.1',
   meson_version : '>= 0.64.0',
   default_options : ['warning_level=1', 'buildtype=debugoptimized']
 )

{pygobject-3.49.0.dev0 → pygobject-3.50.1}/pyproject.toml

@@ -59,7 +59,10 @@ install = [
     "--config-setting=setup-args=-Dbuildtype=debug",
     "--config-setting=editable-verbose=true",
 ]
-build = ["--no-wheel"]
+build = [
+    "--no-wheel",
+    "--config-setting=setup-args=-Dtests=true",
+]
 
 [tool.meson-python.args]
 setup = ["-Dtests=false", "-Dwheel=true", "--wrap-mode=nofallback"]

{pygobject-3.49.0.dev0 → pygobject-3.50.1}/tests/test_events.py

@@ -45,8 +45,14 @@ import sys
 import gi
 import gi.events
 import asyncio
+import socket
 import threading
-from gi.repository import GLib, Gtk
+from gi.repository import GLib
+
+try:
+    from gi.repository import Gtk
+except ImportError:
+    Gtk = None
 
 
 GTK4 = (Gtk and Gtk._version == "4.0")
@@ -75,6 +81,74 @@ class SubprocessWatcherTests(SubprocessMixin, TestCase):
         self.loop.close()
         super().tearDown()
 
+    # Fix broken test for Python 3.12
+    @unittest.skipUnless(sys.version_info >= (3, 12), "test is added in Python 3.12")
+    def test_subprocess_consistent_callbacks(self):
+        # gh-108973: Test that all subprocess protocol methods are called.
+        # The protocol methods are not called in a determistic order.
+        # The order depends on the event loop and the operating system.
+        events = []
+        fds = [1, 2]
+        expected = [
+            ('pipe_data_received', 1, b'stdout'),
+            ('pipe_data_received', 2, b'stderr'),
+            ('pipe_connection_lost', 1),
+            ('pipe_connection_lost', 2),
+            'process_exited',
+        ]
+        per_fd_expected = [
+            'pipe_data_received',
+            'pipe_connection_lost',
+        ]
+
+        class MyProtocol(asyncio.SubprocessProtocol):
+            def __init__(self, exit_future: asyncio.Future) -> None:
+                self.exit_future = exit_future
+
+            def pipe_data_received(self, fd, data) -> None:
+                events.append(('pipe_data_received', fd, data))
+                self.exit_maybe()
+
+            def pipe_connection_lost(self, fd, exc) -> None:
+                events.append(('pipe_connection_lost', fd))
+                self.exit_maybe()
+
+            def process_exited(self) -> None:
+                events.append('process_exited')
+                self.exit_maybe()
+
+            def exit_maybe(self):
+                # Only exit when we got all expected events
+                if len(events) >= len(expected):
+                    self.exit_future.set_result(True)
+
+        async def main() -> None:
+            loop = asyncio.get_running_loop()
+            exit_future = asyncio.Future()
+            code = 'import sys; sys.stdout.write("stdout"); sys.stderr.write("stderr")'
+            transport, _ = await loop.subprocess_exec(lambda: MyProtocol(exit_future),
+                                                      sys.executable, '-c', code, stdin=None)
+            await exit_future
+            transport.close()
+
+            return events
+
+        events = self.loop.run_until_complete(main())
+
+        # First, make sure that we received all events
+        self.assertSetEqual(set(events), set(expected))
+
+        # Second, check order of pipe events per file descriptor
+        per_fd_events = {fd: [] for fd in fds}
+        for event in events:
+            if event == 'process_exited':
+                continue
+            name, fd = event[:2]
+            per_fd_events[fd].append(name)
+
+        for fd in fds:
+            self.assertEqual(per_fd_events[fd], per_fd_expected, (fd, events))
+
 
 class GLibEventLoopPolicyTests(unittest.TestCase):
 
@@ -232,6 +306,7 @@ class GLibEventLoopPolicyTests(unittest.TestCase):
         loop.close()
         self.assertEqual(called, True)
 
+    @unittest.skipUnless(Gtk, 'no Gtk')
     def test_recursive_stop(self):
         """Calling stop() on the EventLoop will quit it, even if iteration
         is done recursively."""
@@ -256,3 +331,63 @@ class GLibEventLoopPolicyTests(unittest.TestCase):
         GLib.MainLoop().run()
 
         loop.close()
+
+    @unittest.skipIf(sys.platform == 'win32', 'add reader/writer not implemented')
+    def test_source_fileobj_fd(self):
+        """Regression test for
+        https://gitlab.gnome.org/GNOME/pygobject/-/issues/689
+        """
+        class Echo:
+            def __init__(self, sock, expect_bytes):
+                self.sock = sock
+                self.sent_bytes = 0
+                self.expect_bytes = expect_bytes
+                self.done = asyncio.Future()
+                self.data = bytes()
+
+            def send(self):
+                if self.done.done():
+                    return
+                if self.sent_bytes < len(self.data):
+                    self.sent_bytes += self.sock.send(
+                        self.data[self.sent_bytes:])
+                    print('sent', self.data)
+                if self.sent_bytes >= self.expect_bytes:
+                    self.done.set_result(None)
+                    self.sock.shutdown(socket.SHUT_WR)
+
+            def recv(self):
+                if self.done.done():
+                    return
+                self.data += self.sock.recv(self.expect_bytes)
+                print('received', self.data)
+                if len(self.data) >= self.expect_bytes:
+                    self.sock.shutdown(socket.SHUT_RD)
+
+        async def run():
+            loop = asyncio.get_running_loop()
+            s1, s2 = socket.socketpair()
+            sample = b'Hello!'
+            e = Echo(s1, len(sample))
+            # register using file object and file descriptor
+            loop.add_reader(s1, e.recv)
+            loop.add_writer(s1.fileno(), e.send)
+            s2.sendall(sample)
+            await asyncio.wait_for(e.done, timeout=2.0)
+            echo = bytes()
+            for _ in range(len(sample)):
+                echo += s2.recv(len(sample))
+                if len(echo) == len(sample):
+                    break
+            # remove using file object and file descriptor
+            loop.remove_reader(s1)
+            loop.remove_writer(s1.fileno())
+            s1.close()
+            s2.close()
+            # check if the data was echoed correctly
+            self.assertEqual(sample, echo)
+
+        policy = self.create_policy()
+        loop = policy.get_event_loop()
+        loop.run_until_complete(run())
+        loop.close()

pygobject-3.49.0.dev0/.flake8

@@ -1,3 +0,0 @@
-[flake8]
-ignore=E501,E123,E124,E402,E731,E722,W504
-exclude=subprojects,build,.venv

pygobject-3.49.0.dev0/.gitlab-ci/build-sdists.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-rm -Rf _venv_sdist
-python3 -m venv _venv_sdist
-source _venv_sdist/bin/activate
-mkdir -p dist
-
-# First we create a tarball for GNOME
-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/
-
-VERSION=$(meson introspect --projectinfo --indent _sdist_build | awk -F'"' '/version/ { print $4 }')
-
-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
-
-python -m pip install --upgrade build
-python -m build --sdist
-
-meson rewrite kwargs set project / version ${VERSION}