[dialogflow_task_executive] force to use python3 for additional depen…

…ds of dialogflow_intent_client
jsk-ros-pkg · Nov 14, 2023 · 7953138 · 7953138
1 parent 982ec39
commit 7953138
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/dialogflow_task_executive/CMakeLists.txt b/dialogflow_task_executive/CMakeLists.txt
@@ -60,15 +60,10 @@ elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )
   catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
-elseif("$ENV{ROS_DISTRO}" STRGREATER "melodic")
-  catkin_generate_virtualenv(
-    INPUT_REQUIREMENTS requirements.in.noetic
-    PYTHON_INTERPRETER python3
-    )
-else()
+else("$ENV{ROS_DISTRO}" STRGREATER "melodic")
   catkin_generate_virtualenv(
     INPUT_REQUIREMENTS requirements.in
-    PYTHON_INTERPRETER python2
+    PYTHON_INTERPRETER python3
     )
 endif()
 

diff --git a/dialogflow_task_executive/node_scripts/dialogflow_client.py b/dialogflow_task_executive/node_scripts/dialogflow_client.py
@@ -117,7 +117,7 @@ def make_dialog_msg(self, result):
         # check if ROS_PYTHON_VERSION exists in indigo
         if (self.language == 'ja-JP'
             and ("ROS_PYTHON_VERSION" not in os.environ
-                 or os.environ["ROS_PYTHON_VERSION"] == "2")):
+                 or sys.version_info.major <= 2)):
             msg.query = result.query_text.encode("utf-8")
             msg.response = result.fulfillment_text.encode("utf-8")
         else:

diff --git a/dialogflow_task_executive/requirements.in b/dialogflow_task_executive/requirements.in
@@ -1,3 +1,8 @@
 dialogflow==1.1.1
+google-api-core[grpc]==1.33.0
+grpcio-status==1.48.1
+googleapis-common-protos[grpc]==1.56.2
+protobuf==3.20.1  # fix Could not find a version that matches protobuf<4.0.0dev,<5.0.0dev,>=3.15.0,>=3.20.1,>=4.21.3 (from google-api-core[grpc]==1.33.1->dialogflow==1.1.1->-r requirements.in (line 1))
+grpcio==1.54.0            # via google-api-core, googleapis-common-protos, grpcio-status
 google-auth==2.9.0
 google-cloud-dialogflow==2.14.1
diff --git a/dialogflow_task_executive/requirements.in.noetic b/dialogflow_task_executive/requirements.in.noetic