Skip to content

Commit

Permalink
Added networkx as testing dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
lorycontixd committed May 20, 2024
1 parent 9618b08 commit 195cb68
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ style =
pre-commit
testing =
idyntree >= 12.2.1
networkx
pytest >=6.0
pytest-icdiff
robot-descriptions
Expand Down
8 changes: 7 additions & 1 deletion src/jaxsim/parsers/descriptions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
from .collision import BoxCollision, CollidablePoint, CollisionShape, SphereCollision, MeshCollision
from .collision import (
BoxCollision,
CollidablePoint,
CollisionShape,
MeshCollision,
SphereCollision,
)
from .joint import JointDescription, JointGenericAxis, JointType
from .link import LinkDescription
from .model import ModelDescription
15 changes: 1 addition & 14 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ def jaxsim_model_ergocub() -> js.model.JaxSimModel:
_ = os.environ.pop("ROBOT_DESCRIPTION_COMMIT", None)

from robot_descriptions._package_dirs import get_package_dirs

os.environ["ROBOT_DESCRIPTION_URI_PATH"] = (
robot_descriptions.ergocub_description.PACKAGE_PATH
)
Expand All @@ -193,16 +194,9 @@ def jaxsim_model_ergocub() -> js.model.JaxSimModel:
)
)

<<<<<<< HEAD
os.environ["GAZEBO_MODEL_PATH"] = os.environ.get(
"GAZEBO_MODEL_PATH", ""
) + ":".join(get_package_dirs(robot_descriptions.ergocub_description))
=======
os.environ["GAZEBO_MODEL_PATH"] = (
os.environ.get("GAZEBO_MODEL_PATH", "")
+ f":{get_package_dirs(robot_descriptions.ergocub_description)}"
)
>>>>>>> 4f96412 (Use already existing env var to solve mesh URIs)

return build_jaxsim_model(model_description=model_urdf_path)

Expand Down Expand Up @@ -252,16 +246,9 @@ def jaxsim_model_ur10() -> js.model.JaxSimModel:

model_urdf_path = pathlib.Path(robot_descriptions.ur10_description.URDF_PATH)

<<<<<<< HEAD
os.environ["GAZEBO_MODEL_PATH"] = os.environ.get(
"GAZEBO_MODEL_PATH", ""
) + ":".join(get_package_dirs(robot_descriptions.ur10_description))
=======
os.environ["GAZEBO_MODEL_PATH"] = (
os.environ.get("GAZEBO_MODEL_PATH", "")
+ f":{get_package_dirs(robot_descriptions.ur10_description)}"
)
>>>>>>> 4f96412 (Use already existing env var to solve mesh URIs)

return build_jaxsim_model(model_description=model_urdf_path)

Expand Down

0 comments on commit 195cb68

Please sign in to comment.