diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-09 22:45:03 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-13 11:05:39 +0200 |
| commit | a4657004d50688e8c761abf1876210214e8e0082 (patch) | |
| tree | a3d1c6bebac6079744ae841fe1ca950ffc1c3a04 | |
| parent | c452ffcc6e625340621bec6c03d334cb64ee80ad (diff) | |
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
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e8bcfc..44541c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,13 +11,13 @@ stages: .common_variables: variables: FDO_UPSTREAM_REPO: mobile-broadband/libqmi - FDO_DISTRIBUTION_VERSION: '18.04' - FDO_DISTRIBUTION_TAG: '2021-07-22.1' + FDO_DISTRIBUTION_VERSION: '20.04' + FDO_DISTRIBUTION_TAG: '2021-09-10.2' FDO_DISTRIBUTION_PACKAGES: ca-certificates git gcc autoconf automake libtool libgirepository1.0-dev libglib2.0-dev autopoint - gtk-doc-tools libglib2.0-doc libgudev-1.0-dev - gobject-introspection valac bash-completion meson - ninja-build + gtk-doc-tools python-is-python3 libglib2.0-doc + libgudev-1.0-dev gobject-introspection valac + bash-completion meson ninja-build build container: extends: diff --git a/meson.build b/meson.build index 49fcea0..2113cd5 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', ) qmi_version = meson.project_version() @@ -44,7 +44,7 @@ qmi_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() |