Skip to content

Commit

Permalink
Update Python packages to setuptools (#47)
Browse files Browse the repository at this point in the history 
* Update Python packages to setuptools

* Revert some irrelevant changes
  • Loading branch information
@lukeschmitt-tr
lukeschmitt-tr authored Mar 16, 2023
1 parent d17d7ce commit 45cc26d
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 23 deletions.
9 changes: 6 additions & 3 deletions interbotix_common_toolbox/interbotix_common_modules/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>interbotix_common_modules</name>
<version>0.0.0</version>
<description>The interbotix_common_modules package</description>
<maintainer email="[email protected]">Luke Schmitt</maintainer>
<license>BSD</license>
<author email="[email protected]">Solomon Wiznitzer</author>

<buildtool_depend>catkin</buildtool_depend>
<exec_depend condition="$ROS_PYTHON_VERSION==2">python-numpy</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION==3">python3-numpy</exec_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-numpy</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-numpy</exec_depend>
<exec_depend>tf</exec_depend>

<export>
Expand Down
2 changes: 1 addition & 1 deletion interbotix_common_toolbox/interbotix_common_modules/setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
Expand Down
11 changes: 6 additions & 5 deletions interbotix_common_toolbox/interbotix_landmark_modules/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>interbotix_landmark_modules</name>
<version>0.0.0</version>
<description>The interbotix_landmark_modules package</description>
<maintainer email="[email protected]">Luke Schmitt</maintainer>
<license>BSD</license>
<author email="[email protected]">Luke Schmitt</author>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend>rostest</buildtool_depend>
<build_depend>geometry_msgs</build_depend>

<build_depend>geometry_msgs</build_depend>
<build_depend>tf2_ros</build_depend>
<build_depend>tf2_geometry_msgs</build_depend>
<build_depend>visualization_msgs</build_depend>

<build_export_depend>geometry_msgs</build_export_depend>
<build_export_depend>tf2_ros</build_export_depend>
<build_export_depend>tf2_geometry_msgs</build_export_depend>
<build_export_depend>visualization_msgs</build_export_depend>
<build_export_depend>interbotix_common_modules</build_export_depend>

<exec_depend>geometry_msgs</exec_depend>
<exec_depend>tf2_ros</exec_depend>
<exec_depend>tf2_geometry_msgs</exec_depend>
<exec_depend>visualization_msgs</exec_depend>
<exec_depend>interbotix_common_modules</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-six</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-six</exec_depend>

<test_depend>rosunit</test_depend>
<test_depend>interbotix_perception_modules</test_depend>

Expand Down
2 changes: 1 addition & 1 deletion interbotix_common_toolbox/interbotix_landmark_modules/setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
Expand Down
5 changes: 4 additions & 1 deletion interbotix_perception_toolbox/interbotix_perception_modules/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<package format="2">
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>interbotix_perception_modules</name>
<version>0.0.0</version>
<description>The interbotix_perception_modules package</description>
Expand All @@ -11,6 +12,8 @@
<!-- The *depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
<build_depend>apriltag_ros</build_depend>
<build_depend>cv_bridge</build_depend>
<build_depend>message_generation</build_depend>
Expand Down
2 changes: 1 addition & 1 deletion interbotix_perception_toolbox/interbotix_perception_modules/setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
Expand Down
9 changes: 6 additions & 3 deletions interbotix_rpi_toolbox/interbotix_rpi_modules/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<?xml version="1.0"?>
<package format="2">
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>interbotix_rpi_modules</name>
<version>0.0.0</version>
<description>The interbotix_rpi_modules package</description>
<maintainer email="[email protected]">Solomon Wiznitzer</maintainer>
<maintainer email="[email protected]">Luke Schmitt</maintainer>
<license>BSD</license>
<!-- <url type="website">http://wiki.ros.org/interbotix_rpi_modules</url> -->
<author email="solomon@trossenrobotics.com">Solomon Wiznitzer</author>
<author email="trsupport@trossenrobotics.com">Solomon Wiznitzer</author>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
<build_depend>message_generation</build_depend>
<build_depend>rospy</build_depend>
<build_depend>std_msgs</build_depend>
Expand Down
2 changes: 1 addition & 1 deletion interbotix_rpi_toolbox/interbotix_rpi_modules/setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
Expand Down
9 changes: 6 additions & 3 deletions interbotix_ux_toolbox/interbotix_ux_modules/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<?xml version="1.0"?>
<package format="2">
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>interbotix_ux_modules</name>
<version>0.0.0</version>
<description>The interbotix_ux_modules package</description>
<maintainer email="[email protected]">Solomon Wiznitzer</maintainer>
<maintainer email="[email protected]">Luke Schmitt</maintainer>
<license>BSD</license>
<!-- <url type="website">http://wiki.ros.org/interbotix_ux_modules</url> -->
<author email="solomon@trossenrobotics.com">Solomon Wiznitzer</author>
<author email="trsupport@trossenrobotics.com">Solomon Wiznitzer</author>

<!-- The *depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
<build_depend>xarm_api</build_depend>
<build_export_depend>xarm_api</build_export_depend>
<exec_depend>xarm_api</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion interbotix_ux_toolbox/interbotix_ux_modules/setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
Expand Down
7 changes: 5 additions & 2 deletions interbotix_xs_toolbox/interbotix_xs_modules/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<?xml version="1.0"?>
<package format="2">
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>interbotix_xs_modules</name>
<version>0.0.0</version>
<description>The interbotix_xs_modules package</description>
<maintainer email="[email protected]">Solomon Wiznitzer</maintainer>
<maintainer email="[email protected]">Luke Schmitt</maintainer>
<license>BSD</license>
<author email="[email protected]">Solomon Wiznitzer</author>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
<build_depend>interbotix_xs_msgs</build_depend>
<build_export_depend>interbotix_xs_msgs</build_export_depend>
<exec_depend>interbotix_xs_msgs</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion interbotix_xs_toolbox/interbotix_xs_modules/setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD

from distutils.core import setup
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
Expand Down

0 comments on commit 45cc26d

Please sign in to comment.