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.

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

Migrate from urdfpy to urchin #33

Merged
merged 1 commit into from
Apr 20, 2023
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ If you want to convert your model into basic shapes, you can use [`idyntree-mode

Other requisites are:

- [`urdfpy`](https://github.com/mmatl/urdfpy)
- [`urchin`](https://github.com/fishbotics/urchin)
- [`dataclasses`](https://pypi.org/project/dataclasses/)
- [`unittest`](https://pypi.org/project/unittest/)

Expand Down
2 changes: 1 addition & 1 deletion examples/stickBotModification.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"from urdfModifiers.core.jointModifier import JointModifier\n",
"from urdfModifiers import utils\n",
"from urdfModifiers.core.modification import Modification\n",
"from urdfpy import URDF\n",
"from urchin import URDF\n",
"from urdfModifiers.geometry import * \n",
"from urdfModifiers.geometry.geometry import Side\n",
"from urdfModifiers.utils import *\n",
Expand Down
2 changes: 1 addition & 1 deletion examples/stickBotModificationFromConfFile.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"from urdfModifiers.core.linkModifier import LinkModifier\n",
"from urdfModifiers.core.jointModifier import JointModifier\n",
"from urdfModifiers import utils\n",
"from urdfpy import URDF\n",
"from urchin import URDF\n",
"from urdfModifiers.geometry import * \n",
"from urdfModifiers.geometry.geometry import Side\n",
"from urdfModifiers.utils import *\n",
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = 0.0.2
packages = find:
python_requires = >=3.7
install_requires =
urdfpy
urchin
numpy
dataclasses
idyntree
Expand Down
2 changes: 1 addition & 1 deletion tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from urdfModifiers.geometry import *
from urdfModifiers.geometry.geometry import Side
from urdfModifiers.utils import *
from urdfpy import matrix_to_xyz_rpy
from urchin import matrix_to_xyz_rpy
import math

"""
Expand Down
2 changes: 1 addition & 1 deletion urdfModifiers/core/fixedOffsetModifier.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from urdfpy import matrix_to_xyz_rpy
from urchin import matrix_to_xyz_rpy
from math import isclose
import numpy as np
from urdfModifiers.core.jointModifier import JointModifier
Expand Down
2 changes: 1 addition & 1 deletion urdfModifiers/core/jointModifier.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from urdfModifiers.core import modifier
from urdfModifiers.geometry.geometry import *
from urdfpy import xyz_rpy_to_matrix, matrix_to_xyz_rpy
from urchin import xyz_rpy_to_matrix, matrix_to_xyz_rpy

class JointModifier(modifier.Modifier):
"""Class to modify joints in a URDF"""
Expand Down
2 changes: 1 addition & 1 deletion urdfModifiers/core/linkModifier.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from dataclasses import dataclass
from urdfpy import xyz_rpy_to_matrix, matrix_to_xyz_rpy
from urchin import xyz_rpy_to_matrix, matrix_to_xyz_rpy
from urdfModifiers.core import modifier
import math
import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion urdfModifiers/utils/utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from typing import Tuple
from urdfpy import URDF
from urchin import URDF
from urdfModifiers.geometry import *
import os

Expand Down