scripts/build-unit-test-docker: Update to meson 0.58.0
Change-Id: Id8e90ffa6d2bf94c4c821a5d79bde7a9e04d26c3
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index b07351b..440022a 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -824,7 +824,7 @@
RUN pip3 install inflection
RUN pip3 install pycodestyle
RUN pip3 install jsonschema
-RUN pip3 install meson==0.57.1
+RUN pip3 install meson==0.58.0
RUN pip3 install protobuf
RUN pip3 install codespell
"""
diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 467b14e..e56389a 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -8,6 +8,9 @@
"""
from git import Repo
+# interpreter is not used directly but this resolves dependency ordering
+# that would be broken if we didn't include it.
+from mesonbuild import interpreter
from mesonbuild import coredata, optinterpreter
from mesonbuild.mesonlib import OptionKey
from mesonbuild.mesonlib import version_compare as meson_version_compare