Imported Upstream version 3.30.0

diff --git a/NEWS b/NEWS
index e8d7b5a..2b62f00 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+3.30.0 - 2018-08-31
+-------------------
+
+* Various test suite fixes to get things to pass with Ubuntu 18.10.
+
+
 3.29.3 - 2018-08-16
 -------------------
 

diff --git a/PKG-INFO b/PKG-INFO
index c15d2b1..6f76658 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PyGObject
-Version: 3.29.3
+Version: 3.30.0
 Summary: Python bindings for GObject Introspection
 Home-page: https://pygobject.readthedocs.io
 Author: James Henstridge

diff --git a/PyGObject.egg-info/PKG-INFO b/PyGObject.egg-info/PKG-INFO
index c15d2b1..6f76658 100644 (file)
--- a/PyGObject.egg-info/PKG-INFO
+++ b/PyGObject.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: PyGObject
-Version: 3.29.3
+Version: 3.30.0
 Summary: Python bindings for GObject Introspection
 Home-page: https://pygobject.readthedocs.io
 Author: James Henstridge

diff --git a/gi/overrides/GObject.py b/gi/overrides/GObject.py
index 089b2a4..68ba6d5 100644 (file)
--- a/gi/overrides/GObject.py
+++ b/gi/overrides/GObject.py
@@ -707,7 +707,7 @@ class Binding(GObjectModule.Binding):
 
     def unbind(self):
         # Fixed in newer glib
-        if (GLib.MAJOR_VERSION, GLib.MINOR_VERSION, GLib.MICRO_VERSION) >= (2, 57, 2):
+        if (GLib.MAJOR_VERSION, GLib.MINOR_VERSION, GLib.MICRO_VERSION) >= (2, 57, 3):
             return super(Binding, self).unbind()
 
         if hasattr(self, '_unbound'):

diff --git a/meson.build b/meson.build
index 4e1faff..ba88913 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('pygobject', 'c',
-  version : '3.29.3',
+  version : '3.30.0',
   meson_version : '>= 0.46.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized'])

diff --git a/setup.py b/setup.py
index 38bc2e4..752ccc7 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ from distutils import dir_util, log
 from distutils.spawn import find_executable
 
 
-PYGOBJECT_VERISON = "3.29.3"
+PYGOBJECT_VERISON = "3.30.0"
 GLIB_VERSION_REQUIRED = "2.38.0"
 GI_VERSION_REQUIRED = "1.46.0"
 PYCAIRO_VERSION_REQUIRED = "1.11.1"

diff --git a/tests/__init__.py b/tests/__init__.py
index 1611db3..1ab73f0 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -89,6 +89,9 @@ def init_test_environ():
     os.environ['GSETTINGS_SCHEMA_DIR'] = tests_builddir
     os.environ['G_FILENAME_ENCODING'] = 'UTF-8'
 
+    # Force the default theme so broken themes don't affect the tests
+    os.environ['GTK_THEME'] = 'Adwaita'
+
     import gi
     gi.require_version("GIRepository", "2.0")
     from gi.repository import GIRepository

diff --git a/tests/conftest.py b/tests/conftest.py
index 4d0cc6b..820210c 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -16,18 +16,16 @@ def pytest_runtest_call(item):
     like any signal handler, vfuncs tc)
     """
 
-    assert sys.excepthook is sys.__excepthook__
-
     exceptions = []
 
     def on_hook(type_, value, tback):
         exceptions.append((type_, value, tback))
 
+    orig_excepthook = sys.excepthook
     sys.excepthook = on_hook
     try:
         yield
     finally:
-        assert sys.excepthook in (on_hook, sys.__excepthook__)
-        sys.excepthook = sys.__excepthook__
+        sys.excepthook = orig_excepthook
         if exceptions:
             reraise(*exceptions[0])

diff --git a/tests/test_atoms.py b/tests/test_atoms.py
index cc8dc3c..0081a02 100644 (file)
--- a/tests/test_atoms.py
+++ b/tests/test_atoms.py
@@ -98,4 +98,3 @@ class TestGdkAtom(unittest.TestCase):
         axes = device.list_axes()
         axes_names = [atom.name() for atom in axes]
         self.assertNotEqual(axes_names, [])
-        self.assertTrue('Rel X' in axes_names)

diff --git a/tests/test_gobject.py b/tests/test_gobject.py
index 17106da..bef3e9b 100644 (file)
--- a/tests/test_gobject.py
+++ b/tests/test_gobject.py
@@ -592,7 +592,7 @@ class TestPropertyBindings(unittest.TestCase):
         glib_version = (GLib.MAJOR_VERSION, GLib.MINOR_VERSION, GLib.MICRO_VERSION)
 
         # calling unbind() on an already unbound binding
-        if glib_version >= (2, 57, 2):
+        if glib_version >= (2, 57, 3):
             # Fixed in newer glib:
             # https://gitlab.gnome.org/GNOME/glib/merge_requests/244
             for i in range(10):