fix python-future dependency (#542)

* fix python-future dependency This was not fixed with fadffa0 The dependency was added with #541 Python doesn't have build dependencies, only exec dependencies * update ros-tooling/action-ros-ci See: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ This was fixed upstream - ros-tooling/action-ros-ci#429 - ros-tooling/action-ros-ci#430 * update ros-tooling/setup-ros See: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ This is needed for upstream fix - ros-tooling/setup-ros#303
RobotWebTools · Dec 8, 2020 · 311ae01 · 311ae01
1 parent 48eff50
commit 311ae01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ros_ci.yml b/.github/workflows/ros_ci.yml
@@ -39,11 +39,11 @@ jobs:
         with:
           path: ros_ws/src
       - name: setup ROS environment
-        uses: ros-tooling/setup-ros@0.0.25
+        uses: ros-tooling/setup-ros@0.1.0
         with:
           required-ros-distributions: ${{ matrix.ros_distribution }}
       - name: build and test
-        uses: ros-tooling/action-ros-ci@0.0.19
+        uses: ros-tooling/action-ros-ci@0.1.0
         with:
          package-name: rosbridge_suite
          target-ros1-distro: ${{ matrix.ros_distribution }}

diff --git a/rosbridge_library/package.xml b/rosbridge_library/package.xml
@@ -35,6 +35,7 @@
   <exec_depend>rosservice</exec_depend>
   <exec_depend>rostopic</exec_depend>
   <exec_depend>std_msgs</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-future</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-imaging</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-pil</exec_depend>
   <exec_depend>geometry_msgs</exec_depend>