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
7 changes: 5 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ authors = [
dependencies = [
"numpy",
"spatialmath-python>=1.1.16",
# Pinned to a commit on SG's unreleased main (1.4 draft) -- Link.py's
# SceneGroup(initlist) call requires the API there. Switch to a normal
# ">=1.4.0" constraint once spatialgeometry actually cuts that release.
"spatialgeometry @ git+https://github.com/jhavl/spatialgeometry.git@ce69b8bbe23ec79c0c395e007725512081808487",
"pgraph-python",
"scipy",
"matplotlib",
Expand Down Expand Up @@ -128,10 +132,9 @@ build-backend = "scikit_build_core.build"


[tool.scikit-build]
wheel.packages = ["src/roboticstoolbox", "src/spatialgeometry"]
wheel.packages = ["src/roboticstoolbox"]
sdist.include = [
"src/roboticstoolbox",
"src/spatialgeometry",
"tests",
"CMakeLists.txt",
"README.md",
Expand Down
6 changes: 3 additions & 3 deletions src/roboticstoolbox/bin/rtbtool.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from traitlets.config import Config
import IPython
import argparse
from pathlib import Path
import pathlib
import shlex
import sys
import os
Expand Down Expand Up @@ -213,7 +213,7 @@ def make_banner():

def examples_path():
# Repository layout: <root>/src/roboticstoolbox/bin/rtbtool.py
return Path(__file__).resolve().parents[3] / "examples"
return pathlib.Path(__file__).resolve().parents[3] / "examples"


def startup():
Expand Down Expand Up @@ -310,7 +310,7 @@ def out_prompt_tokens(self, cli=None):
# set up a script to be executed by IPython when we get there
code = None
if args.script is not None:
path = Path(args.script)
path = pathlib.Path(args.script)
if not path.exists():
raise ValueError(f"script does not exist: {args.script}")
code = path.open("r").readlines()
Expand Down
4 changes: 2 additions & 2 deletions src/roboticstoolbox/robot/Link.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ def __init__(
self._name = name

# Link geometry
self._geometry = SceneGroup(scene_children=geometry)
self._geometry = SceneGroup(geometry)
self._scene_children.append(self._geometry)

# Collision Geometry
self._collision = SceneGroup(scene_children=collision)
self._collision = SceneGroup(collision)
self._scene_children.append(self._collision)

# Link dynamic Parameters
Expand Down
32 changes: 0 additions & 32 deletions src/spatialgeometry/__init__.py

This file was deleted.

294 changes: 0 additions & 294 deletions src/spatialgeometry/geom/CollisionShape.py

This file was deleted.

Loading