| Message ID | 20240326-meson-v2-1-d9f9003775e9@daynix.com |
|---|---|
| State | New |
| Headers | show |
| Series | meson: Fix MESONINTROSPECT parsing | expand |
On Tue, 26 Mar 2024 at 12:35, Akihiko Odaki <akihiko.odaki@daynix.com> wrote: > > We need meson v1.4.0 to fix MESONINTROSPECT quoting on Windows: > https://github.com/mesonbuild/meson/pull/12807 > > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > --- > python/scripts/vendor.py | 4 ++-- > python/wheels/meson-1.2.3-py3-none-any.whl | Bin 964928 -> 0 bytes > python/wheels/meson-1.4.0-py3-none-any.whl | Bin 0 -> 935471 bytes > pythondeps.toml | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > --- a/pythondeps.toml > +++ b/pythondeps.toml > @@ -19,7 +19,7 @@ > > [meson] > # The install key should match the version in python/wheels/ > -meson = { accepted = ">=0.63.0", installed = "1.2.3", canary = "meson" } > +meson = { accepted = ">=0.63.0", installed = "1.4.0", canary = "meson" } If we need 1.4.0 why does this still say we accept anything 0.63.0 or better ? If we use shlex.split(), does that go wrong for pre-1.4.0 meson only on Windows, or is it broken for all platforms? (i.e. could we if we wanted to make the requirement "1.4.0 for windows, 0.63.0 for others"?) thanks -- PMM
On 2024/03/26 21:40, Peter Maydell wrote: > On Tue, 26 Mar 2024 at 12:35, Akihiko Odaki <akihiko.odaki@daynix.com> wrote: >> >> We need meson v1.4.0 to fix MESONINTROSPECT quoting on Windows: >> https://github.com/mesonbuild/meson/pull/12807 >> >> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> >> --- >> python/scripts/vendor.py | 4 ++-- >> python/wheels/meson-1.2.3-py3-none-any.whl | Bin 964928 -> 0 bytes >> python/wheels/meson-1.4.0-py3-none-any.whl | Bin 0 -> 935471 bytes >> pythondeps.toml | 2 +- >> 4 files changed, 3 insertions(+), 3 deletions(-) > >> --- a/pythondeps.toml >> +++ b/pythondeps.toml >> @@ -19,7 +19,7 @@ >> >> [meson] >> # The install key should match the version in python/wheels/ >> -meson = { accepted = ">=0.63.0", installed = "1.2.3", canary = "meson" } >> +meson = { accepted = ">=0.63.0", installed = "1.4.0", canary = "meson" } > > If we need 1.4.0 why does this still say we accept anything 0.63.0 > or better ? > > If we use shlex.split(), does that go wrong for pre-1.4.0 > meson only on Windows, or is it broken for all platforms? It is only needed for Windows. > (i.e. could we if we wanted to make the requirement > "1.4.0 for windows, 0.63.0 for others"?) I just followed what commit 1a1e889f3576 ("buildsys: Bump known good meson version to v1.2.3") did, which don't bump the accepted version. But certainly we can do better and conditionally ensure meson==1.4.0 on Windows in the configure script as commit edc210789500 ("python: use vendored tomli") does. Regards, Akihiko Odaki > > thanks > -- PMM
diff --git a/python/scripts/vendor.py b/python/scripts/vendor.py index 1038b14ae0c8..da463fbde557 100755 --- a/python/scripts/vendor.py +++ b/python/scripts/vendor.py @@ -41,8 +41,8 @@ def main() -> int: parser.parse_args() packages = { - "meson==1.2.3": - "4533a43c34548edd1f63a276a42690fce15bde9409bcf20c4b8fa3d7e4d7cac1", + "meson==1.4.0": + "476a458d51fcfa322a6bdc64da5138997c542d08e6b2e49b9fa68c46fd7c4475", "tomli==2.0.1": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", diff --git a/python/wheels/meson-1.2.3-py3-none-any.whl b/python/wheels/meson-1.2.3-py3-none-any.whl deleted file mode 100644 index a8b84e5f114a..000000000000 Binary files a/python/wheels/meson-1.2.3-py3-none-any.whl and /dev/null differ diff --git a/python/wheels/meson-1.4.0-py3-none-any.whl b/python/wheels/meson-1.4.0-py3-none-any.whl new file mode 100644 index 000000000000..ca9adc3f024d Binary files /dev/null and b/python/wheels/meson-1.4.0-py3-none-any.whl differ diff --git a/pythondeps.toml b/pythondeps.toml index 0e8841599935..4269decf0e3e 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -19,7 +19,7 @@ [meson] # The install key should match the version in python/wheels/ -meson = { accepted = ">=0.63.0", installed = "1.2.3", canary = "meson" } +meson = { accepted = ">=0.63.0", installed = "1.4.0", canary = "meson" } [docs] sphinx = { accepted = ">=1.6", installed = "5.3.0", canary = "sphinx-build" }
We need meson v1.4.0 to fix MESONINTROSPECT quoting on Windows: https://github.com/mesonbuild/meson/pull/12807 Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- python/scripts/vendor.py | 4 ++-- python/wheels/meson-1.2.3-py3-none-any.whl | Bin 964928 -> 0 bytes python/wheels/meson-1.4.0-py3-none-any.whl | Bin 0 -> 935471 bytes pythondeps.toml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-)