Skip to content

Commit

Permalink
revive pre-commit with fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
woensug-choi committed Jun 28, 2024
1 parent b265572 commit 2f04a8a
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 25 deletions.
22 changes: 13 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ repos:

# Python hooks
- repo: https://github.com/asottile/pyupgrade
rev: v3.15.2
rev: v3.16.0
hooks:
- id: pyupgrade
args: [--py36-plus]
Expand All @@ -65,14 +65,14 @@ repos:
args: ["--line-length=99", "--exclude=tools/code_check"]

- repo: https://github.com/pycqa/flake8
rev: 7.0.0
rev: 7.1.0
hooks:
- id: flake8
args: ["--extend-ignore=E501", "--exclude=tools/code_check"]

# CPP hooks
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.5
rev: v18.1.7
hooks:
- id: clang-format
args: ["-fallback-style=none", "-i"]
Expand Down Expand Up @@ -103,8 +103,11 @@ repos:
name: ament_lint_cmake
description: Check format of CMakeLists.txt files.
entry: ament_lint_cmake
additional_dependencies: [ament-lint-cmake-py]
language: system
files: CMakeLists\.txt$
language: python

Check failure on line 109 in .pre-commit-config.yaml

View workflow job for this annotation

GitHub Actions / Run Linters for Code Format Check

109:9 [key-duplicates] duplication of key "language" in mapping
types: [python]

# Copyright (exclude for now, doesn't exist for nobel
# https://packages.ubuntu.com/search?keywords=ament+copyright&searchon=names)
Expand Down Expand Up @@ -144,7 +147,7 @@ repos:

# Json lint
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.4
rev: 0.28.6
hooks:
- id: check-github-workflows
args: ["--verbose"]
Expand All @@ -154,18 +157,19 @@ repos:
args: ["--verbose"]

# XML lint for xacro, urdf, and sdf files
- repo: local
- repo: https://github.com/lsst-ts/pre-commit-xmllint
rev: v1.0.0
hooks:
- id: xml-lint-robot-files
- id: format-xmllint
name: xml-lint-robot-files
description: Lint XML syntax in xacro, urdf, and sdf files.
entry: xmllint --noout
language: system
entry: check-xmllint
# language: system
types: [text]
files: \.(xacro|urdf|sdf|xml|launch)$

- repo: https://github.com/turo/pre-commit-hooks
rev: v3.5.0
rev: v4.0.0 # You may version pin this if desired
hooks:
- id: docker-lint
files: \.dockerfile
Expand Down
3 changes: 0 additions & 3 deletions dave/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
<version>0.0.0</version>
<description>Metapackage for Dave related packages</description>
<maintainer email="[email protected]">Woen-Sug Choi</maintainer>

<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
Expand Down
5 changes: 0 additions & 5 deletions examples/dave_demos/package.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">

<name>dave_demos</name>
<version>0.1.0</version>
<description> A package for demo launch files.</description>

<maintainer email="[email protected]">Rakesh Vivekanandan</maintainer>

<license>MIT</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
Expand Down
5 changes: 0 additions & 5 deletions models/dave_object_models/package.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">

<name>dave_object_models</name>
<version>0.1.0</version>
<description> Dave model description files are placed here. </description>

<maintainer email="[email protected]">Rakesh Vivekanandan</maintainer>

<license>MIT</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<export>
<build_type>ament_cmake</build_type>
<!-- This doesn't work yet https://github.com/gazebosim/ros_gz/pull/492 -->
Expand Down
3 changes: 0 additions & 3 deletions models/dave_worlds/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
<description>TODO: Package description</description>
<maintainer email="[email protected]">lena</maintainer>
<license>Apache-2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
Expand Down

0 comments on commit 2f04a8a

Please sign in to comment.