Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import setup from setuptools instead of distutils.core #287

Open
wants to merge 20 commits into
base: kinetic-devel
Choose a base branch
from
Open

Import setup from setuptools instead of distutils.core #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9a949fb
change to setuptools in accordance with migration guide
arne48 Feb 26, 2023
cc179cc
add buildtool_depend in accordance with migration guide
arne48 Feb 26, 2023
c7c6762
change to setuptools in accordance with migration guide
arne48 Feb 26, 2023
9476f52
add buildtool_depend in accordance with migration guide
arne48 Feb 26, 2023
8be5610
change to setuptools in accordance with migration guide
arne48 Feb 26, 2023
2e482d6
add buildtool_depend in accordance with migration guide
arne48 Feb 26, 2023
0106fd2
change to setuptools in accordance with migration guide
arne48 Feb 26, 2023
0995c22
add buildtool_depend in accordance with migration guide
arne48 Feb 26, 2023
b211f43
bump of format version
arne48 Feb 26, 2023
888ea8c
bump of format version
arne48 Feb 26, 2023
e342b5f
bump of format version
arne48 Feb 26, 2023
e75efb4
bump of format version
arne48 Feb 26, 2023
ef94889
revert format bump
arne48 Feb 26, 2023
1897398
revert format bump
arne48 Feb 26, 2023
81c505a
revert format bump
arne48 Feb 26, 2023
5482e21
revert format bump
arne48 Feb 26, 2023
79cf42e
removed buildtool_depend due to low format version
arne48 Feb 26, 2023
3b8e9bb
removed buildtool_depend due to low format version
arne48 Feb 26, 2023
db6cc11
removed buildtool_depend due to low format version
arne48 Feb 26, 2023
e0c943a
updated package.xml to format version 3
arne48 Mar 1, 2023
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
8 changes: 4 additions & 4 deletions rqt/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rqt</name>
<version>0.5.3</version>
<description>rqt is a Qt-based framework for GUI development for ROS. It consists of three parts/metapackages<br />
Expand All @@ -21,9 +21,9 @@

<buildtool_depend>catkin</buildtool_depend>

<run_depend version_gte="0.3.0">rqt_gui</run_depend>
<run_depend version_gte="0.3.0">rqt_gui_cpp</run_depend>
<run_depend version_gte="0.3.0">rqt_gui_py</run_depend>
<exec_depend version_gte="0.3.0">rqt_gui</exec_depend>
<exec_depend version_gte="0.3.0">rqt_gui_cpp</exec_depend>
<exec_depend version_gte="0.3.0">rqt_gui_py</exec_depend>

<export>
<metapackage/>
Expand Down
2 changes: 2 additions & 0 deletions rqt_gui/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<author email="[email protected]">Michael Jeronimo</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 version_gte="0.3.0">qt_gui</build_depend>

Expand Down
2 changes: 1 addition & 1 deletion rqt_gui/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

from distutils.core import setup
from setuptools import setup

from catkin_pkg.python_setup import generate_distutils_setup

Expand Down
12 changes: 7 additions & 5 deletions rqt_gui_cpp/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rqt_gui_cpp</name>
<version>0.5.3</version>
<description>rqt_gui_cpp enables GUI plugins to use the C++ client library for ROS.</description>
Expand All @@ -11,17 +11,19 @@
<author email="[email protected]">Michael Jeronimo</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 version_gte="0.3.0">qt_gui</build_depend>
<build_depend version_gte="0.3.0">qt_gui_cpp</build_depend>
<build_depend>qtbase5-dev</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>nodelet</build_depend>

<run_depend version_gte="0.3.0">qt_gui</run_depend>
<run_depend version_gte="0.3.0">qt_gui_cpp</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>nodelet</run_depend>
<exec_depend version_gte="0.3.0">qt_gui</exec_depend>
<exec_depend version_gte="0.3.0">qt_gui_cpp</exec_depend>
<exec_depend>roscpp</exec_depend>
<exec_depend>nodelet</exec_depend>

<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,${prefix}/lib -lrqt_gui_cpp"/>
Expand Down
2 changes: 1 addition & 1 deletion rqt_gui_cpp/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

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

d = generate_distutils_setup(
Expand Down
10 changes: 6 additions & 4 deletions rqt_gui_py/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rqt_gui_py</name>
<version>0.5.3</version>
<description>rqt_gui_py enables GUI plugins to use the Python client library for ROS.</description>
Expand All @@ -11,14 +11,16 @@
<author email="[email protected]">Michael Jeronimo</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 version_gte="0.3.0">qt_gui</build_depend>
<build_depend version_gte="0.3.0">rqt_gui</build_depend>
<build_depend>rospy</build_depend>

<run_depend version_gte="0.3.0">qt_gui</run_depend>
<run_depend version_gte="0.3.0">rqt_gui</run_depend>
<run_depend>rospy</run_depend>
<exec_depend version_gte="0.3.0">qt_gui</exec_depend>
<exec_depend version_gte="0.3.0">rqt_gui</exec_depend>
<exec_depend>rospy</exec_depend>

<export>
<rqt_gui plugin="${prefix}/plugin.xml"/>
Expand Down
2 changes: 1 addition & 1 deletion rqt_gui_py/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

from distutils.core import setup
from setuptools import setup

from catkin_pkg.python_setup import generate_distutils_setup

Expand Down
20 changes: 11 additions & 9 deletions rqt_py_common/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rqt_py_common</name>
<version>0.5.3</version>
<description>
Expand All @@ -20,22 +20,24 @@
<author>Dirk Thomas</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>genmsg</build_depend>
<build_depend>std_msgs</build_depend>

<run_depend>genpy</run_depend>
<run_depend version_gte="0.2.19">python_qt_binding</run_depend>
<run_depend>qt_gui</run_depend>
<run_depend>roslib</run_depend>
<run_depend>rospy</run_depend>
<run_depend>rostopic</run_depend>
<exec_depend>genpy</exec_depend>
<exec_depend version_gte="0.2.19">python_qt_binding</exec_depend>
<exec_depend>qt_gui</exec_depend>
<exec_depend>roslib</exec_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rostopic</exec_depend>

<!-- 3/11/2013 depending on actionlib & rosbag is only temporary;
rosaction.py needs it. In the future this run_depend will be removed when
rosaction gets moved to actionlib. -->
<run_depend>actionlib</run_depend>
<run_depend>rosbag</run_depend>
<exec_depend>actionlib</exec_depend>
<exec_depend>rosbag</exec_depend>

<export>
<architecture_independent/>
Expand Down
2 changes: 1 addition & 1 deletion rqt_py_common/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python

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

d = generate_distutils_setup(
Expand Down