Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exclude: ^src/external_dependencies/
repos:
# Standard hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v6.0.0
hooks:
- id: check-ast
- id: check-case-conflict
Expand All @@ -31,12 +31,12 @@ repos:
- id: fix-byte-order-marker

- repo: https://github.com/psf/black
rev: 22.3.0
rev: 25.9.0
hooks:
- id: black

- repo: https://github.com/codespell-project/codespell
rev: v2.0.0
rev: v2.4.1
hooks:
- id: codespell
args: ["--write-changes", "-L", "atleast,inout,ether"] # Provide a comma-separated list of misspelled words that codespell should ignore (for example: '-L', 'word1,word2,word3').
Expand All @@ -51,7 +51,7 @@ repos:
args: ["-fallback-style=none"]

- repo: https://github.com/adrienverge/yamllint
rev: v1.27.1
rev: v1.37.1
hooks:
- id: yamllint
args:
Expand All @@ -64,13 +64,13 @@ repos:
files: \.(yml|yaml)$

- repo: https://github.com/tcort/markdown-link-check
rev: v3.10.3
rev: v3.14.1
hooks:
- id: markdown-link-check

# NOTE: Broken on arm64. Will need to bump once https://github.com/hadolint/hadolint/issues/840 is fixed.
- repo: https://github.com/hadolint/hadolint
rev: v2.11.0
rev: v2.14.0
hooks:
- id: hadolint
name: "Lint Dockerfiles"
Expand All @@ -79,7 +79,7 @@ repos:
entry: hadolint/hadolint:2.11.0 hadolint

- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v3.1.0"
rev: "v4.0.0-alpha.8"
hooks:
# Use Prettier to lint XML files because, well.. its rules are prettier than most linters, as the name implies.
# Also we use it in the UI, so it's familiar.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
timeout="-1.000000"
/>
<Action ID="SetupMTCCurrentState" task="{mtc_task}" />
<!--The arm is moved to this intermediate waypoint to give a more predicable arm motion while avoiding the hanging bowls. Even with a collision object modeled the arm would still make large motions at times which influenced how well the part was aligned to the jig posts.-->
<!--The arm is moved to this intermediate waypoint to give a more predictable arm motion while avoiding the hanging bowls. Even with a collision object modeled the arm would still make large motions at times which influenced how well the part was aligned to the jig posts.-->
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codespell fix

<Action
ID="SetupMTCPlanToJointState"
acceleration_scale_factor="1"
Expand Down
1 change: 1 addition & 0 deletions src/hangar_sim/launch/sim/localization_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
from launch_ros.descriptions import ComposableNode, ParameterFile
from nav2_common.launch import RewrittenYaml


Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

black formatter fix

# This file is adapted from: https://github.com/ros-navigation/navigation2/blob/humble/nav2_bringup/launch/localization_launch.py
def generate_launch_description():
# Get the launch directory
Expand Down
3 changes: 3 additions & 0 deletions src/lab_sim/test/objectives_integration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@
"Stack Blocks with ICP", # Skipped because there is no primary ui to switch to in ci
"Teleoperate",
"Inspector",
"Pick 1 Pill Bottle",
"AddBottlesToPlanningScene",
Comment on lines +77 to +78
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't run these since they were causing CI to flake since they have ML objectives

}


# This is a workaround to avoid the test running before ros control is ready
def wait_for_gripper_action_server(timeout: int = 180):
node = rclpy.create_node("test_node")
Expand Down
Loading