From ae737508566283f5f1f67d7659e911a30eb7acb5 Mon Sep 17 00:00:00 2001 From: Michael Rapp Date: Wed, 23 Oct 2024 23:16:28 +0200 Subject: [PATCH 1/4] Update dependency "cpplint" to version 2.0 or greater. --- CPPLINT.cfg | 1 + scons/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CPPLINT.cfg b/CPPLINT.cfg index a2d3840373..c68d29bd44 100644 --- a/CPPLINT.cfg +++ b/CPPLINT.cfg @@ -1,5 +1,6 @@ filter=-build/include_subdir filter=-build/include_order +filter=-build/include_what_you_use filter=-build/c++11 filter=-legal/copyright diff --git a/scons/requirements.txt b/scons/requirements.txt index 5286e2b9c5..e480cf8419 100644 --- a/scons/requirements.txt +++ b/scons/requirements.txt @@ -1,5 +1,5 @@ build >= 1.2, < 1.3 -cpplint >= 1.6, < 1.7 +cpplint >= 2.0, < 2.1 clang-format >= 19.1, < 19.2 cython >= 3.0, < 3.1 isort >= 5.13, < 5.14 From 8352bbbda558129e6bbd5fdb83d39db88b9f62b0 Mon Sep 17 00:00:00 2001 From: Michael Rapp Date: Wed, 23 Oct 2024 23:19:31 +0200 Subject: [PATCH 2/4] Update dependency "mdformat-myst" to version 0.2 or greater. --- scons/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scons/requirements.txt b/scons/requirements.txt index e480cf8419..1d9fa92195 100644 --- a/scons/requirements.txt +++ b/scons/requirements.txt @@ -4,7 +4,7 @@ clang-format >= 19.1, < 19.2 cython >= 3.0, < 3.1 isort >= 5.13, < 5.14 mdformat >= 0.7, < 0.8 -mdformat-myst >= 0.1, < 0.2 +mdformat-myst >= 0.2, < 0.3 meson >= 1.5, < 1.6 ninja >= 1.11, < 1.12 pylint >= 3.3, < 3.4 From ad74fec42a0bde78e57c6de7dc14c1b464559a46 Mon Sep 17 00:00:00 2001 From: Michael Rapp Date: Wed, 23 Oct 2024 23:29:36 +0200 Subject: [PATCH 3/4] Update dependency "meson" to version 1.6 or greater. --- cpp/meson.build | 2 +- cpp/subprojects/common/meson.build | 2 +- python/meson.build | 2 +- scons/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/meson.build b/cpp/meson.build index cbd59635e4..d6db0e84a4 100644 --- a/cpp/meson.build +++ b/cpp/meson.build @@ -1,4 +1,4 @@ -project('mlrl', default_options : ['cpp_std=c++17', 'buildtype=release', 'werror=true']) +project('mlrl', meson_version : '>=1.1', default_options : ['cpp_std=c++17', 'buildtype=release', 'werror=true']) subprojects = get_option('subprojects') diff --git a/cpp/subprojects/common/meson.build b/cpp/subprojects/common/meson.build index 16813aa525..e9b88d3f88 100644 --- a/cpp/subprojects/common/meson.build +++ b/cpp/subprojects/common/meson.build @@ -1,4 +1,4 @@ -project('common', 'cpp') +project('common', 'cpp', meson_version : '>=1.1') # Source files source_files = [ diff --git a/python/meson.build b/python/meson.build index 99206c3f94..8ee5d599f6 100644 --- a/python/meson.build +++ b/python/meson.build @@ -1,4 +1,4 @@ -project('mlrl-python', default_options : ['cpp_std=c++17', 'buildtype=release']) +project('mlrl-python', meson_version : '>=1.1', default_options : ['cpp_std=c++17', 'buildtype=release']) subprojects = get_option('subprojects') diff --git a/scons/requirements.txt b/scons/requirements.txt index 1d9fa92195..69531684c7 100644 --- a/scons/requirements.txt +++ b/scons/requirements.txt @@ -5,7 +5,7 @@ cython >= 3.0, < 3.1 isort >= 5.13, < 5.14 mdformat >= 0.7, < 0.8 mdformat-myst >= 0.2, < 0.3 -meson >= 1.5, < 1.6 +meson >= 1.6, < 1.7 ninja >= 1.11, < 1.12 pylint >= 3.3, < 3.4 setuptools From f2c2d6704fcbfcbd006b1ce43ca47076980cfed7 Mon Sep 17 00:00:00 2001 From: michael-rapp <6638695+michael-rapp@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:55:30 +0000 Subject: [PATCH 4/4] [Bot] Merge bugfix into feature branch. --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index a8839f70de..d33c3a2128 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.11.2 \ No newline at end of file +0.12.0 \ No newline at end of file