Merge branch 'alatiera/bump-gi-requirment' into 'main'

Port to libgirepository-2.0

See merge request jwestman/blueprint-compiler!218

blueprintcompiler/gir.py

@@ -24,20 +24,8 @@ from functools import cached_property
 
 import gi  # type: ignore
 
-try:
-    gi.require_version("GIRepository", "3.0")
-    from gi.repository import GIRepository  # type: ignore
-
-    _repo = GIRepository.Repository()
-except ValueError:
-    # We can remove this once we can bump the minimum dependencies
-    # to glib 2.80 and pygobject 3.52
-    # dependency('glib-2.0', version: '>= 2.80.0')
-    # dependency('girepository-2.0', version: '>= 2.80.0')
-    gi.require_version("GIRepository", "2.0")
-    from gi.repository import GIRepository  # type: ignore
-
-    _repo = GIRepository.Repository
+gi.require_version("GIRepository", "3.0")
+from gi.repository import GIRepository  # type: ignore
 
 from . import typelib, xml_reader
 from .errors import CompileError, CompilerBugError
@@ -54,7 +42,8 @@ def add_typelib_search_path(path: str):
 
 
 def get_namespace(namespace: str, version: str) -> "Namespace":
-    search_paths = [*_repo.get_search_path(), *_user_search_paths]
+    repo = GIRepository.Repository()
+    search_paths = [*repo.get_search_path(), *_user_search_paths]
 
     filename = f"{namespace}-{version}.typelib"
 
@@ -85,8 +74,9 @@ def get_available_namespaces() -> T.List[T.Tuple[str, str]]:
     if len(_available_namespaces):
         return _available_namespaces
 
+    repo = GIRepository.Repository()
     search_paths: list[str] = [
-        *_repo.get_search_path(),
+        *repo.get_search_path(),
         *_user_search_paths,
     ]
 

meson.build

@@ -7,6 +7,9 @@ datadir = join_paths(prefix, get_option('datadir'))
 
 py = import('python').find_installation('python3')
 
+dependency('glib-2.0', version: '>= 2.80.0')
+dependency('girepository-2.0', version: '>= 2.80.0')
+
 subdir('docs')
 
 configure_file(