diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8968d84dc..a58d94308b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: # Standard hooks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v5.0.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -33,7 +33,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 23.10.0 + rev: 24.10.0 hooks: - id: black @@ -54,10 +54,11 @@ repos: exclude: CHANGELOG.rst - repo: https://github.com/cheshirekow/cmake-format-precommit - rev: v0.6.10 + rev: v0.6.13 hooks: - id: cmake-format - id: cmake-lint - args: - - "--disabled-codes=C0301" # Disable Line too long lint - - "--suppress-decorations" + args: [--line-width 220, + --disabled-codes=C0307, + --suppress-decorations + ] diff --git a/moveit/scripts/create_readme_table.py b/moveit/scripts/create_readme_table.py index 6dd624dcb1..7a4ca872a5 100644 --- a/moveit/scripts/create_readme_table.py +++ b/moveit/scripts/create_readme_table.py @@ -62,9 +62,9 @@ def define_urls(target, params): ) params["url"] = "{base_url}/view/{R}src_u{U}/job/{job}".format(**params) elif target == "bin": - params[ - "job" - ] = "{R}bin_u{U}64__{package}__ubuntu_{ubuntu}_amd64__binary".format(**params) + params["job"] = ( + "{R}bin_u{U}64__{package}__ubuntu_{ubuntu}_amd64__binary".format(**params) + ) params["url"] = "{base_url}/view/{R}bin_u{U}64/job/{job}".format(**params) diff --git a/moveit_configs_utils/moveit_configs_utils/substitutions/xacro.py b/moveit_configs_utils/moveit_configs_utils/substitutions/xacro.py index f49ebb1334..60af65907e 100644 --- a/moveit_configs_utils/moveit_configs_utils/substitutions/xacro.py +++ b/moveit_configs_utils/moveit_configs_utils/substitutions/xacro.py @@ -67,8 +67,8 @@ def perform(self, context: LaunchContext) -> Text: for key, value in self.__mappings.items(): normalized_key = normalize_to_list_of_substitutions(key) normalized_value = normalize_to_list_of_substitutions(value) - expanded_mappings[ - perform_substitutions(context, normalized_key) - ] = perform_substitutions(context, normalized_value) + expanded_mappings[perform_substitutions(context, normalized_key)] = ( + perform_substitutions(context, normalized_value) + ) return load_xacro(Path(expanded_file_path), mappings=expanded_mappings) diff --git a/moveit_core/version/version.cmake b/moveit_core/version/version.cmake index 3c1b7bc4bc..57be5e545e 100644 --- a/moveit_core/version/version.cmake +++ b/moveit_core/version/version.cmake @@ -10,16 +10,16 @@ if("${MOVEIT_GIT_NAME}" STREQUAL "HEAD") execute_process( COMMAND git describe --contains --all HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE MOVEIT_GIT_NAME OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_QUIET) + OUTPUT_VARIABLE MOVEIT_GIT_NAME + OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) endif() # Retrieve (short) commit hash execute_process( COMMAND git rev-parse --short HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE MOVEIT_GIT_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_QUIET) + OUTPUT_VARIABLE MOVEIT_GIT_COMMIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" MOVEIT_VERSION_MAJOR "${moveit_core_VERSION}")