Merge branch 'master' into add-switchbot-status-publisher

jsk-ros-pkg · Jul 10, 2024 · d0465ce · d0465ce
2 parents f754384 + 432a373
commit d0465ce
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 5 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -6,6 +6,8 @@ on:
 
 env:
   DISPLAY: ':0.0'
+  # workaround required for checkout@v3, https://github.com/actions/checkout/issues/1590
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
   ros:

diff --git a/.travis b/.travis
diff --git a/.travis.rosinstall.indigo b/.travis.rosinstall.indigo
@@ -9,5 +9,5 @@
 # we need to avoid pip upgrade
 - git:
     local-name: locusrobotics/catkin_virtualenv
-    uri: https://github.com/locusrobotics/catkin_virtualenv
-    version: 0.2.2
+    uri: https://github.com/locusrobotics/catkin_virtualenv-release
+    version: release/melodic/catkin_virtualenv/0.2.2-0
diff --git a/dialogflow_task_executive/CMakeLists.txt b/dialogflow_task_executive/CMakeLists.txt
@@ -55,7 +55,10 @@ elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
     COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/requirements.txt.indigo ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )
-  catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
+  file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
+  catkin_generate_virtualenv(PYTHON_INTERPRETER python2
+    # https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
+    EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem)
 elseif("$ENV{ROS_DISTRO}" STRGREATER "melodic")
   catkin_generate_virtualenv(
     INPUT_REQUIREMENTS requirements.in.noetic

diff --git a/gdrive_ros/CMakeLists.txt b/gdrive_ros/CMakeLists.txt
@@ -23,10 +23,20 @@ catkin_package(
   message_runtime
 )
 
+if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
+file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
 catkin_generate_virtualenv(
   PYTHON_INTERPRETER python3
   CHECK_VENV FALSE
+  # https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
+  EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
   )
+else()
+catkin_generate_virtualenv(
+  PYTHON_INTERPRETER python3
+  CHECK_VENV FALSE
+  )
+endif()
 
 
 catkin_install_python(PROGRAMS node_scripts/gdrive_server_node.py node_scripts/sample_gdrive_rospy_client.py

diff --git a/respeaker_ros/CMakeLists.txt b/respeaker_ros/CMakeLists.txt
@@ -19,6 +19,13 @@ if($ENV{ROS_DISTRO} STRGREATER "melodic")
     PYTHON_INTERPRETER python3
     CHECK_VENV FALSE
     )
+elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
+  file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
+  catkin_generate_virtualenv(
+    PYTHON_INTERPRETER python2
+    # https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
+    EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
+  )
 else()
   catkin_generate_virtualenv(
     PYTHON_INTERPRETER python2

diff --git a/ros_speech_recognition/CMakeLists.txt b/ros_speech_recognition/CMakeLists.txt
@@ -29,7 +29,16 @@ if($ENV{ROS_DISTRO} STREQUAL "indigo" OR
     COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/requirements.txt.indigo ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )
-  catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
+  if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
+    file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
+    catkin_generate_virtualenv(
+      PYTHON_INTERPRETER python2
+      # https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
+      EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
+    )
+  else()
+    catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
+  endif()
 else()
 catkin_generate_virtualenv(
   PYTHON_INTERPRETER python3

diff --git a/sesame_ros/CMakeLists.txt b/sesame_ros/CMakeLists.txt
@@ -24,6 +24,13 @@ if($ENV{ROS_DISTRO} STRGREATER "melodic")
   catkin_generate_virtualenv(
     PYTHON_INTERPRETER python3
     )
+elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
+  file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
+  catkin_generate_virtualenv(
+    PYTHON_INTERPRETER python2
+    # https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
+    EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
+  )
 else()
   catkin_generate_virtualenv(
     PYTHON_INTERPRETER python2

diff --git a/switchbot_ros/CMakeLists.txt b/switchbot_ros/CMakeLists.txt
@@ -33,10 +33,20 @@ generate_messages(
 
 catkin_package()
 
+if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
+file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
 catkin_generate_virtualenv(
   PYTHON_INTERPRETER python3
   CHECK_VENV FALSE
+  # https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
+  EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
 )
+else()
+catkin_generate_virtualenv(
+  PYTHON_INTERPRETER python3
+  CHECK_VENV FALSE
+)
+endif()
 
 include_directories()