Skip to content

Commit 1b522e6

Browse files
committed
feat: bundle spatialgeometry as pure-Python (removes external dep)
1 parent 0a5a402 commit 1b522e6

10 files changed

Lines changed: 1654 additions & 7 deletions

File tree

pyproject.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ authors = [
1313

1414
dependencies = [
1515
"numpy",
16-
# "spatialmath-python>=1.1.5",
17-
"spatialmath-python @ git+https://github.com/petercorke/spatialmath-python.git@good",
18-
# "spatialgeometry>=1.0.0",
19-
"spatialgeometry @ git+https://github.com/petercorke/spatialgeometry.git@future",
16+
"spatialmath-python>=1.1.16",
2017
"pgraph-python",
2118
"scipy",
2219
"matplotlib",
@@ -133,9 +130,10 @@ build-backend = "scikit_build_core.build"
133130

134131

135132
[tool.scikit-build]
136-
wheel.packages = ["src/roboticstoolbox"]
133+
wheel.packages = ["src/roboticstoolbox", "src/spatialgeometry"]
137134
sdist.include = [
138135
"src/roboticstoolbox",
136+
"src/spatialgeometry",
139137
"tests",
140138
"CMakeLists.txt",
141139
"README.md",
@@ -161,10 +159,12 @@ build = ["cp310-*", "cp311-*", "cp312-*", "cp313-*"]
161159
skip = ["*musllinux*"]
162160

163161
[tool.cibuildwheel.macos]
164-
archs = ["auto"] # arm64 only from macos-latest; x86_64 EOL
162+
archs = ["auto"] # arm64 only from macos-latest; x86_64 EOL
165163

166164
[tool.cibuildwheel.linux]
167-
archs = ["auto"] # native arch only; arm64 uses ubuntu-24.04-arm runner (no QEMU)
165+
archs = [
166+
"auto",
167+
] # native arch only; arm64 uses ubuntu-24.04-arm runner (no QEMU)
168168

169169
[tool.cibuildwheel.windows]
170170
archs = ["AMD64"]

src/spatialgeometry/__init__.py

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
from spatialgeometry.geom import (
2+
SceneNode,
3+
SceneGroup,
4+
Shape,
5+
Axes,
6+
Arrow,
7+
CollisionShape,
8+
Mesh,
9+
Cylinder,
10+
Cuboid,
11+
Box,
12+
Sphere)
13+
14+
from spatialgeometry import tools
15+
16+
17+
__all__ = [
18+
# aliased
19+
"tools",
20+
# geom
21+
"Shape",
22+
"CollisionShape",
23+
"Mesh",
24+
"Cylinder",
25+
"Cuboid",
26+
"Box",
27+
"Sphere",
28+
"Axes",
29+
"Arrow",
30+
"SceneNode",
31+
"SceneGroup",
32+
]

0 commit comments

Comments
 (0)