From bda799dff2dc4b5d607f0e822b12ed0e2db38fb7 Mon Sep 17 00:00:00 2001 From: Charles Brunet Date: Wed, 19 Apr 2023 07:56:42 -0400 Subject: fix python.version() not working in some cases import('python').find_installation('python').version() causes exception because of a missing initialization, when `find_installation()` receives a name or a path. --- mesonbuild/dependencies/python.py | 1 + test cases/python/1 basic/meson.build | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py index 14386f96f..b9fbbbbdc 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py @@ -75,6 +75,7 @@ class BasicPythonExternalProgram(ExternalProgram): self.name = name self.command = ext_prog.command self.path = ext_prog.path + self.cached_version = None # We want strong key values, so we always populate this with bogus data. # Otherwise to make the type checkers happy we'd have to do .get() for diff --git a/test cases/python/1 basic/meson.build b/test cases/python/1 basic/meson.build index 2e543dd7d..481a88179 100644 --- a/test cases/python/1 basic/meson.build +++ b/test cases/python/1 basic/meson.build @@ -8,6 +8,9 @@ if py_version.version_compare('< 3.2') error('MESON_SKIP_TEST python 3 required for tests') endif +py_full_version = py.version() +message(f'Using python version: @py_full_version@') + py_purelib = py.get_path('purelib') if not (py_purelib.endswith('site-packages') or py_purelib.endswith('dist-packages')) error('Python3 purelib path seems invalid? ' + py_purelib) -- cgit v1.2.3