Skip to content

dialogflow_task_executive: re-enable idnigo #342

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

Merged
k-okada merged 2 commits into from
May 16, 2022
+42 −8
Merged

dialogflow_task_executive: re-enable idnigo #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8742b0
dialogflow_task_executive: re-enable idnigo
k-okada May 13, 2022
30585ce
dialogflow_task_executive/CMakeLists.txt: [indigo] copy requirement.t…
k-okada May 13, 2022
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
21 changes: 13 additions & 8 deletions dialogflow_task_executive/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
cmake_minimum_required(VERSION 2.8.3)
project(dialogflow_task_executive)

if($ENV{ROS_DISTRO} STREQUAL "indigo")
message(WARNING "following requirements.txt syntax is not support on 14.04")
message(WARNING "google-api-core[grpc]==1.31.5 # via google-cloud-language")
find_package(catkin)
catkin_package()
return()
endif()
execute_process(COMMAND bash -c "gcc -dumpmachine" OUTPUT_VARIABLE gcc_dump_machine OUTPUT_STRIP_TRAILING_WHITESPACE)
message("-- gcc dumpmachine returns ${gcc_dump_machine}")
if(NOT gcc_dump_machine MATCHES "x86_64-.*")
Expand Down Expand Up @@ -42,7 +35,19 @@ catkin_package(
CATKIN_DEPENDS message_runtime
)

catkin_generate_virtualenv(INPUT_REQUIREMENTS requirements.in)
if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
message(WARNING "following requirements.txt syntax is not support on 14.04")
message(WARNING "google-api-core[grpc]==1.31.5 # via google-cloud-language")
message(WARNING "so we intentionally use requirements.txt")
message(WARNING "To use this program, we need to run")
message(WARNING "sed -i 's/upgrade_pip=True/upgrade_pip=False/' /opt/ros/indigo/share/catkin_virtualenv/cmake/build_venv.py")
message(WARNING "to prevent upgrading to latest pip, which is not Python2 compatible")
file(COPY requirements.txt.indigo DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/requirements.txt.indigo requirements.txt)
catkin_generate_virtualenv()
else()
catkin_generate_virtualenv(INPUT_REQUIREMENTS requirements.in)
endif()

file(GLOB NODE_SCRIPTS_FILES node_scripts/*.py)
catkin_install_python(
Expand Down
29 changes: 29 additions & 0 deletions dialogflow_task_executive/requirements.txt.indigo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
####
#### this is only sed for indigo (pr2)
####
#### kinetic+ users will use requirements.in
####
pyparsing==2.2.0
#
dialogflow==0.3.0
#
cachetools==0.2.0
certifi==2017.7.27.1
chardet==3.0.4
futures==3.2.0
google-api-core==1.12.0
google-auth==1.6.3
google-auth-httplib2==0.0.3
googleapis-common-protos==1.6.0
httplib2==0.14.0
idna==2.6
protobuf==3.12.2
pyasn1==0.4.3
pyasn1-modules
pytz==2017.2
requests==2.18.4
rsa==3.4.2
setuptools==40.3.0
six==1.11.0
urllib3==1.22