Skip to content

Commit

Permalink
Use Python 3 everywhere
Browse files Browse the repository at this point in the history
Since Python 2 is retired in 4 months, we should move everything to 3.
  • Loading branch information
julianoes authored and TSC21 committed Nov 23, 2019
1 parent a7ff764 commit b281c9b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ endif()

# python
include(px4_find_python_module)
find_package(PythonInterp REQUIRED)
find_package(PythonInterp 3 REQUIRED)

option(PYTHON_COVERAGE "Python code coverage" OFF)
if(PYTHON_COVERAGE)
Expand Down
8 changes: 4 additions & 4 deletions cmake/px4_find_python_module.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ function(px4_find_python_module module)
endif()
endif()
find_package_handle_standard_args(PY_${module}
"couldn't find python module ${module}:
"couldn't find python3 module ${module}:
\nfor debian systems try: \
\n\tsudo apt-get install python-${module} \
\n\tsudo apt-get install python3-${module} \
\nor for all other OSs/debian: \
\n\tsudo -H pip install ${module}\n" PY_${module_upper})
\n\tsudo -H pip3 install ${module}\n" PY_${module_upper})
#if (NOT PY_${module}_FOUND)
#message(FATAL_ERROR "python module not found, exiting")
#message(FATAL_ERROR "python3 module not found, exiting")
#endif()
endfunction(px4_find_python_module)
6 changes: 3 additions & 3 deletions msg/tools/px_generate_uorb_topic_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
On a Debian/Ubuntu system please run:
sudo apt-get install python-empy
sudo pip install catkin_pkg
sudo apt-get install python3-empy
sudo pip3 install catkin_pkg
On MacOS please run:
sudo pip install empy catkin_pkg
sudo pip3 install empy catkin_pkg
On Windows please run:
easy_install empy catkin_pkg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
except ImportError as e:
print("python import error: ", e)
print('''
Required python packages not installed.
Required python3 packages not installed.
On a GNU/Linux or MacOS system please run:
sudo pip install numpy toml
sudo pip3 install numpy toml
On Windows please run:
easy_install numpy toml
Expand Down

0 comments on commit b281c9b

Please sign in to comment.