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
16 changes: 0 additions & 16 deletions .github/workflows/flake8-problem-matcher.json

This file was deleted.

13 changes: 5 additions & 8 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: |
python3 -m mypy --exclude=build .

flake8:
ruff-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -29,13 +29,10 @@ jobs:
python-version: '3.10'
- name: Install
run: |
python3 -m pip install flake8
- name: Add matcher
run: |
echo "::add-matcher::.github/workflows/flake8-problem-matcher.json"
- name: Lint with flake8
run: |
python3 -m flake8 .
python3 -m pip install ruff

- name: Run ruff check
run: ruff check --output-format=github .

black:
runs-on: ubuntu-latest
Expand Down
8 changes: 6 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ requires = ["setuptools>=42", "wheel"]
[tool.black]
line-length = 79

[tool.pylint.messages_control]
disable = "C0330, C0326"
[tool.ruff]
lint.select = [
"E",
"F",
#"B", # bugbear
]

[tool.mypy]
ignore_missing_imports = true
Expand Down
4 changes: 2 additions & 2 deletions trifinger_simulation/real_finger.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env python3
# -------------------------------------------------------------------------------------------------
# --------------------------------------------------------------------------------------
# The documentation in this code is heavily derived from the official
# documentation of PyBullet at
# https://docs.google.com/document/d/10sXEhzFRSnvFcl3XxNGhnD4N2SedqwdAvK3dsihxVUA/edit#
# among other scattered sources.
# -------------------------------------------------------------------------------------------------
# --------------------------------------------------------------------------------------
import os
from ament_index_python.packages import get_package_share_directory

Expand Down
2 changes: 1 addition & 1 deletion trifinger_simulation/tasks/rearrange_dice/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def _get_cell_corners_3d(

# order of the corners is the same as in the cube model of the
# trifinger_object_tracking package
# people.tue.mpg.de/mpi-is-software/robotfingers/docs/trifinger_object_tracking/doc/cube_model.html
# https://open-dynamic-robot-initiative.github.io/trifinger_object_tracking/doc/a2_cube_model.html
return np.array(
(
nppos + (d, -d, d),
Expand Down
Loading