Skip to content

Commit 162a0d8

Browse files
committed
fixed setup.py deps with naked pixi
1 parent 99d632e commit 162a0d8

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

docs/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Motion Stack
2323
.. |rtb| image:: https://img.shields.io/badge/Powered_by-Robotics_toolbox-006400
2424
:target: https://github.com/petercorke/robotics-toolbox-python
2525

26-
.. |test| image:: https://github.com/2lian/Motion-Stack/actions/workflows/doit_install.yaml/badge.svg
27-
:target: https://github.com/2lian/Motion-Stack/actions/workflows/doit_install.yaml
26+
.. |test| image:: https://github.com/2lian/Motion-Stack/actions/workflows/pixi_tests.yaml/badge.svg
27+
:target: https://github.com/2lian/Motion-Stack/actions/workflows/pixi_tests.yaml
2828

2929
.. grid:: 2
3030
:gutter: 0

src/motion_stack/setup.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44

55
package_name = "motion_stack"
66

7-
VALID_ROS = {"humble", "foxy", "jazzy"}
7+
VALID_ROS = {"humble", "foxy", "jazzy", "kilted"}
88

99

1010
def get_ros_distro():
1111
files = glob("/opt/ros/*")
1212
roses = {(f.split("/")[-1]) for f in files}
1313
the_ros = roses & VALID_ROS
1414
if len(the_ros) != 1:
15-
raise ImportError(
16-
f"ROS2 distro could not be deduced, found: {the_ros}, valids are: {VALID_ROS}"
15+
print(
16+
f"ROS2 distro could not be deduced, falling back to jazzy."
1717
)
18+
the_ros = ["jazzy"]
1819
return the_ros.pop()
1920

2021

@@ -37,11 +38,12 @@ def get_ros_distro():
3738
],
3839
install_requires=[
3940
# "setuptools==58.2.0", # necessary for jazzy venv install
40-
"pytest==6.2.5" if ros != "jazzy" else "pytest",
4141
# "colcon-core", # necessary for jazzy venv install
4242
# "lark", # necessary for jazzy venv install
4343
# "catkin_pkg", # necessary for jazzy venv install
4444
# "colcon-common-extensions", # necessary for jazzy venv install
45+
# "pytest",
46+
"pytest==6.2.5" if ros == "humble" else "pytest",
4547
"numpy>1.20",
4648
"nptyping",
4749
"xacro",
@@ -63,7 +65,7 @@ def get_ros_distro():
6365
license="MIT",
6466
extras_require={
6567
"dev": [
66-
"pytest==6.2.5" if ros != "jazzy" else "pytest",
68+
"pytest==6.2.5" if ros == "humble" else "pytest",
6769
"sphinx",
6870
"myst_parser",
6971
"sphinx-rtd-theme",

0 commit comments

Comments
 (0)