PyGObject 3.48.0__tar.gz → 3.48.2__tar.gz

{pygobject-3.48.0 → pygobject-3.48.2}/.gitlab-ci/Dockerfile

@@ -3,6 +3,7 @@ FROM ubuntu:jammy
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y \
+    software-properties-common \
     build-essential \
     ccache \
     curl \
@@ -30,6 +31,11 @@ RUN apt-get update && apt-get install -y \
     xvfb \
     && rm -rf /var/lib/apt/lists/*
 
+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/*
+
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
@@ -48,7 +54,11 @@ ENV PYTHON_CONFIGURE_OPTS="--enable-shared"
 ENV PYENV_GIT_TAG v2.3.31
 RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
 
-RUN pyenv install pypy3.9
+# 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 pyenv install --debug 3.8
 RUN pyenv install --debug 3.9
 RUN pyenv install --debug 3.10

{pygobject-3.48.0 → pygobject-3.48.2}/.gitlab-ci/run-docker.sh

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

{pygobject-3.48.0 → pygobject-3.48.2}/.gitlab-ci/test-docker.sh

@@ -25,13 +25,20 @@ export MESONPY_EDITABLE_VERBOSE=1
 mkdir -p "${CCACHE_DIR}"
 mkdir -p "${COV_DIR}"
 
+python -m venv /tmp/venv
+source /tmp/venv/bin/activate
+
+# XXX: meson tries to use this for some reason, but it's not there by default
+mkdir -p /tmp/venv/include/pypy3.9
+
+python -m pip install --upgrade pip
 python -m pip install flake8 meson meson-python pycairo
 
 # CODE QUALITY
 python -m flake8
 
 # BUILD & TEST
-python -m pip install --no-build-isolation --editable '.[dev]'
+python -m pip install --config-settings=setup-args="-Dtests=true" --no-build-isolation --editable '.[dev]'
 
 lcov --config-file .gitlab-ci/lcovrc --directory . --capture --initial --output-file \
     "${COV_DIR}/${CI_JOB_NAME}-baseline.lcov"

{pygobject-3.48.0 → pygobject-3.48.2}/.gitlab-ci/test-flatpak.sh

@@ -13,7 +13,7 @@ if [[ "$1" == "inflatpak" ]]; then
     python3 -m venv _venv
     . _venv/bin/activate
     pip install pycairo meson meson-python
-    pip install --no-build-isolation --editable '.[dev]'
+    pip install --config-settings=setup-args="-Dtests=true" --no-build-isolation --editable '.[dev]'
     pytest -v --cov
     python3 -m coverage lcov -o "${COV_DIR}/${COV_KEY}.py.lcov"
     chmod -R 777 "${COV_DIR}"

{pygobject-3.48.0 → pygobject-3.48.2}/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/pygobject/main:v22
+image: registry.gitlab.gnome.org/gnome/pygobject/main:v23
 
 stages:
   - build_and_test
@@ -111,10 +111,10 @@ python3.12:
     TEST_GTK_VERSION: "3.0"
   <<: *defaults
 
-pypy3.9:
+pypy3:
   allow_failure: true
   variables:
-    PYTHON_VERSION: "pypy3.9"
+    PYTHON_VERSION: "pypy3"
     TEST_GTK_VERSION: "3.0"
   <<: *defaults
 

{pygobject-3.48.0 → pygobject-3.48.2}/NEWS

@@ -1,3 +1,15 @@
+3.48.2 - 2024-04-06
+-------------------
+
+* Fix support for fundamental (primitive) types, such as Gst.Bitmask
+  :issue:`624` :mr:`304`
+
+3.48.1 - 2024-03-10
+-------------------
+
+* Fix installation with pip failing in some environments with
+  ModuleNotFoundError in g-ir-scanner :issue:`622` :mr:`302`
+
 3.48.0 - 2024-03-09
 -------------------
 

{pygobject-3.48.0 → pygobject-3.48.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyGObject
-Version: 3.48.0
+Version: 3.48.2
 Summary: Python bindings for GObject Introspection
 Author-Email: James Henstridge <james@daa.com.au>
 Maintainer: Christoph Reiter

{pygobject-3.48.0 → pygobject-3.48.2}/gi/module.py

@@ -76,7 +76,7 @@ def get_parent_for_object(object_info):
         if gtype and gtype.pytype:
             return gtype.pytype
 
-        if object_info.get_fundamental():
+        if object_info.get_fundamental() and gtype.is_instantiatable():
             return Fundamental
 
         # Otherwise use builtins.object as the base

{pygobject-3.48.0 → pygobject-3.48.2}/gi/pygi-fundamental.c

@@ -55,17 +55,11 @@ fundamental_new (PyTypeObject *type,
                  PyObject     *args,
                  PyObject     *kwargs)
 {
-    static char *kwlist[] = { NULL };
-
     GIBaseInfo *info;
     gpointer pointer;
     PyGIFundamental *self = NULL;
     GType g_type;
 
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs, "", kwlist)) {
-        return NULL;
-    }
-
     info = _pygi_object_get_gi_info ((PyObject *) type, &PyGIObjectInfo_Type);
     if (info == NULL) {
         if (PyErr_ExceptionMatches (PyExc_AttributeError)) {
@@ -99,6 +93,19 @@ out:
     return (PyObject *) self;
 }
 
+static int
+fundamental_init(PyObject     *self,
+                 PyObject     *args,
+                 PyObject     *kwargs)
+{
+    static char *kwlist[] = { NULL };
+
+    if (!PyArg_ParseTupleAndKeywords (args, kwargs, ":Fundamental.__init__", kwlist)) {
+        return -1;
+    }
+    return 0;
+}
+
 static PyObject*
 fundamental_richcompare (PyObject *self,
                          PyObject *other,
@@ -222,6 +229,7 @@ pygi_fundamental_register_types (PyObject *m)
 
     PyGIFundamental_Type.tp_alloc = PyType_GenericAlloc;
     PyGIFundamental_Type.tp_new = (newfunc) fundamental_new;
+    PyGIFundamental_Type.tp_init = (initproc) fundamental_init;
     PyGIFundamental_Type.tp_dealloc = (destructor) fundamental_dealloc;
     PyGIFundamental_Type.tp_flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE);
     PyGIFundamental_Type.tp_richcompare = fundamental_richcompare;

{pygobject-3.48.0 → pygobject-3.48.2}/meson.build

@@ -1,5 +1,5 @@
 project('pygobject', 'c',
-  version : '3.48.0',
+  version : '3.48.2',
   meson_version : '>= 0.64.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized'])

{pygobject-3.48.0 → pygobject-3.48.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyGObject"
-version = "3.48.0"
+version = "3.48.2"
 description = "Python bindings for GObject Introspection"
 license = { text = "GNU Lesser General Public License v2.1 (LGPLv2.1)" }
 authors = [
@@ -42,7 +42,7 @@ docs = [
 ]
 
 [tool.meson-python.args]
-setup = ["-Dwheel=true", "--wrap-mode=nofallback"]
+setup = ["-Dtests=false", "-Dwheel=true", "--wrap-mode=nofallback"]
 
 [tool.pytest.ini_options]
 testpaths = [

{pygobject-3.48.0 → pygobject-3.48.2}/tests/gi/overrides/Regress.py

@@ -18,9 +18,30 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
 # USA
 
-from ..importer import modules
+from ..importer import get_introspection_module
+from ..overrides import override
 
-Regress = modules['Regress']._introspection_module
+Regress = get_introspection_module('Regress')
 
 REGRESS_OVERRIDE = 42
-__all__ = ['REGRESS_OVERRIDE']
+
+
+class Bitmask(Regress.Bitmask):
+    """Replicate override of Bitmask (uint64), similar to GStreamer."""
+
+    def __init__(self, v):
+        if not isinstance(v, int):
+            raise TypeError("%s is not an int." % (type(v)))
+
+        self.v = int(v)
+
+    def __str__(self):
+        return hex(self.v)
+
+    def __eq__(self, other):
+        return self.v == other
+
+
+Bitmask = override(Bitmask)
+
+__all__ = ['REGRESS_OVERRIDE', "Bitmask"]

{pygobject-3.48.0 → pygobject-3.48.2}/tests/regressextra.c

@@ -485,3 +485,69 @@ static void regress_test_action_class_init (RegressTestActionClass *klass)
         G_CALLBACK (regress_test_action_do_action2), NULL, NULL,
         NULL, regress_test_action_get_type (), 0);
 }
+
+/*
+ * RegressBitmask
+ *
+ * Mimic a primitive, fundamental type.
+ */
+
+static void
+regress_value_init_bitmask (GValue * value)
+{
+  value->data[0].v_uint64 = 0;
+}
+
+static void
+regress_value_copy_bitmask (const GValue * src_value, GValue * dest_value)
+{
+  dest_value->data[0].v_uint64 = src_value->data[0].v_uint64;
+}
+
+static void
+_value_transform_uint64_bitmask (const GValue * src_value, GValue * dest_value)
+{
+    dest_value->data[0].v_uint64 = src_value->data[0].v_uint64;
+}
+
+static void
+_value_transform_bitmask_uint64 (const GValue * src_value, GValue * dest_value)
+{
+    dest_value->data[0].v_uint64 = src_value->data[0].v_uint64;
+}
+
+static const GTypeValueTable _regress_bitmask_value_table = {
+    regress_value_init_bitmask,
+    NULL,
+    regress_value_copy_bitmask,
+    NULL,
+    (char *) NULL,
+    NULL,
+    (char *) NULL,
+    NULL
+};
+
+GType
+regress_bitmask_get_type (void)
+{
+  static GType regress_bitmask_type = 0;
+
+  if (g_once_init_enter (&regress_bitmask_type)) {
+    GTypeInfo _info = { 0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, &_regress_bitmask_value_table };
+    GTypeFundamentalInfo _finfo = { 0 };
+    GType _type = g_type_register_fundamental (
+        g_type_fundamental_next (),
+        "RegressBitmask", &_info, &_finfo, 0);
+
+    g_once_init_leave(&regress_bitmask_type, _type);
+
+    g_value_register_transform_func (
+      REGRESS_TYPE_BITMASK, G_TYPE_UINT64,
+      _value_transform_bitmask_uint64);
+    g_value_register_transform_func (
+      G_TYPE_UINT64, REGRESS_TYPE_BITMASK,
+      _value_transform_uint64_bitmask);
+  }
+
+  return regress_bitmask_type;
+}

{pygobject-3.48.0 → pygobject-3.48.2}/tests/regressextra.h

@@ -90,4 +90,26 @@ typedef struct {
 _GI_TEST_EXTERN
 GType regress_test_action_get_type (void);
 
+
+/**
+ * RegressBitmask:
+ *
+ * A fundamental type that describes a 64-bit bitmask.
+ *
+ * This type resembles GStreamer's Bitmask type.
+ */
+
+/**
+ * REGRESS_TYPE_BITMASK:
+ *
+ * a #GValue type that represents a 64-bit bitmask.
+ *
+ * Returns: the #GType of RegressBitmask (which is not explicitly typed)
+ */
+
+#define REGRESS_TYPE_BITMASK                 (regress_bitmask_get_type())
+
+_GI_TEST_EXTERN
+GType regress_bitmask_get_type (void);
+
 #endif /* REGRESS_EXTRA_H */

{pygobject-3.48.0 → pygobject-3.48.2}/tests/test_fundamental.py

@@ -130,6 +130,12 @@ def test_multiple_objects():
     assert obj1 != obj2
 
 
+def test_fundamental_primitive_object():
+    bitmask = Regress.Bitmask(2)
+
+    assert bitmask.v == 2
+
+
 def test_custom_fundamental_type_vfunc_override(capsys):
     obj = MyCustomFundamentalObject()
     del obj