From 6df593b048de5862261746697b07c4e6856a2ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Fri, 10 Sep 2021 14:41:25 +0200 Subject: build: Use the newer python module Since 0.48 version of meson, there is a new generic `python` module and the previous `python3` module has been deprecated[0]. The use of the `python3` module has been replaced by this new `python` module. meson version has been bumped to 0.48. CI has also been updated to have this meson version available. [0] https://mesonbuild.com/Release-notes-for-0-48-0.html#python3-module-is-deprecated (cherry picked from commit f5a06ffef8b7fa103555331eef748a5f8bb48ce5) --- .gitlab-ci.yml | 4 ++-- meson.build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec5b51e..38f5c10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,8 @@ stages: .common_variables: variables: FDO_UPSTREAM_REPO: mobile-broadband/libmbim - FDO_DISTRIBUTION_VERSION: '18.04' - FDO_DISTRIBUTION_TAG: '2021-07-22.1' + FDO_DISTRIBUTION_VERSION: '20.04' + FDO_DISTRIBUTION_TAG: '2021-09-13.1' FDO_DISTRIBUTION_PACKAGES: ca-certificates git gcc autoconf automake libtool libgirepository1.0-dev libglib2.0-dev autopoint gtk-doc-tools libglib2.0-doc gobject-introspection diff --git a/meson.build b/meson.build index 7f41149..1bcd00d 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,7 @@ project( 'c_std=gnu89', 'warning_level=2', ], - meson_version: '>= 0.45.1', + meson_version: '>= 0.48.0', ) mbim_version = meson.project_version() @@ -44,7 +44,7 @@ mbim_gir_version = '1.0' gnome = import('gnome') i18n = import('i18n') pkg = import('pkgconfig') -python = import('python3').find_python() +python = import('python').find_installation('python3') source_root = meson.current_source_dir() -- cgit v1.2.1