Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update .pre-commit-config.yaml #2805

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update .pre-commit-config.yaml #2805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b19e6b
.
mosfet80 Nov 15, 2024
a02d15e
Update .pre-commit-config.yaml
mosfet80 Nov 15, 2024
bc50b47
Merge branch 'moveit:main' into patch-3
mosfet80 Nov 17, 2024
6b9bcc6
Merge branch 'moveit:main' into patch-3
mosfet80 Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
]
6 changes: 3 additions & 3 deletions moveit/scripts/create_readme_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
6 changes: 3 additions & 3 deletions moveit_configs_utils/moveit_configs_utils/substitutions/xacro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 4 additions & 4 deletions moveit_core/version/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
Loading