From 4f13c449984a60c618cd9ae263ffe50a101a4c19 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Fri, 19 Jan 2024 13:37:23 -0600
Subject: [PATCH] Add support for flake8 v6 (#608)

It seems that flake8 v6 started checking indentation of multi-line
string literals, but it doesn't seem to work correctly for f-strings.
---
 colcon_core/executor/__init__.py | 2 +-
 setup.cfg                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/colcon_core/executor/__init__.py b/colcon_core/executor/__init__.py
index bba60f3d..aca03575 100644
--- a/colcon_core/executor/__init__.py
+++ b/colcon_core/executor/__init__.py
@@ -244,7 +244,7 @@ def add_executor_arguments(parser):
     group.add_argument(
         '--executor', type=str, choices=keys, default=default,
         help=f'The executor to process all packages (default: {default})'
-             f'{descriptions}')
+             f'{descriptions}')  # noqa: E131
 
     for priority in extensions.keys():
         extensions_same_prio = extensions[priority]
diff --git a/setup.cfg b/setup.cfg
index 34eea709..99e4626d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -44,7 +44,7 @@ zip_safe = false
 
 [options.extras_require]
 test =
-  flake8>=3.6.0,<6
+  flake8>=3.6.0,<7
   flake8-blind-except
   flake8-builtins
   flake8-class-newline