From 288365d2bc77a4c1b6d40afb666098b77812773b Mon Sep 17 00:00:00 2001 From: Andrea Date: Fri, 15 Nov 2024 14:31:16 +0100 Subject: [PATCH 1/3] . . . Update .pre-commit-config.yaml fix cmake-lint config . --- .pre-commit-config.yaml | 13 +++++++------ moveit/scripts/create_readme_table.py | 6 +++--- .../moveit_configs_utils/substitutions/xacro.py | 6 +++--- moveit_core/version/version.cmake | 8 ++++---- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8968d84dc..ebd8448e40 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}") From 89158b454092003be78180333c3ed4103d6b5a54 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Fri, 15 Nov 2024 15:10:00 +0100 Subject: [PATCH 2/3] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ebd8448e40..a58d94308b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -58,7 +58,7 @@ repos: hooks: - id: cmake-format - id: cmake-lint - args: [--line-width 220, + args: [--line-width 220, --disabled-codes=C0307, --suppress-decorations ] From 1dc5b9b2950fe7673ca24786b36089b1fb35293e Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Mon, 28 Apr 2025 13:47:14 +0200 Subject: [PATCH 3/3] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a58d94308b..85c055746c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,7 +33,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 24.10.0 + rev: 25.1.0 hooks: - id: black @@ -47,7 +47,7 @@ repos: files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$ args: ['-fallback-style=none', '-i'] - repo: https://github.com/codespell-project/codespell - rev: v2.3.0 + rev: v2.4.1 hooks: - id: codespell args: ['--write-changes', '--ignore-words=.codespell_words', '--skip="*.eps"']