Skip to content

Commit 390222e

Browse files
committed
[infra] Fix colcon build
1 parent 82e6e67 commit 390222e

5 files changed

Lines changed: 13 additions & 170 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ py_trees.egg-info
77
*.pyc
88
*.png
99
*.svg
10+
install
11+
log
1012
build
1113
dist
1214
deb_dist

pyproject.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ maintainers = [
1313
]
1414
readme = "README.md"
1515
license = { text = "BSD" }
16-
requires-python = ">=3.10,<4.0"
16+
# NOTE: deliberately omitted. `colcon build` (ament_python) introspects setup.py via
17+
# colcon-python-setup-py, which repr()s + ast.literal_eval()s the setuptools metadata.
18+
# setuptools merges this PEP 621 field as a packaging.SpecifierSet, whose repr
19+
# (`<SpecifierSet(...)>`) is not a valid literal and breaks the colcon build.
20+
# requires-python = ">=3.10,<4.0"
1721
keywords = ["py_trees", "py-trees", "behaviour-trees"]
1822
classifiers = [
1923
"Environment :: Console",

resource/py_trees

Whitespace-only changes.

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from setuptools import find_packages, setup
1010

11-
install_requires = ["setuptools", "pydot"]
1211

1312
# Some duplication of properties in:
1413
# - setup.py, (ros / legacy)
@@ -21,7 +20,10 @@
2120
version="2.4.0",
2221
packages=find_packages(exclude=["tests*", "docs*"]),
2322
package_data={"py_trees": ["py.typed"]},
24-
install_requires=install_requires,
23+
data_files=[
24+
("share/ament_index/resource_index/packages", ["resource/py_trees"]),
25+
("share/py_trees", ["package.xml"]),
26+
],
2527
author="Daniel Stonier, Naveed Usmani, Michal Staniaszek",
2628
maintainer="Daniel Stonier <d.stonier@gmail.com>, Sebastian Castro <sebas.a.castro@gmail.com>",
2729
url="https://github.com/splintered-reality/py_trees",

0 commit comments

Comments
 (0)