Tools: use Python 3, improve import checks

In more detail:
- Change shebang to Python 3.
- Suggest installation using pip3 as user.
This commit is contained in:
Julian Oes
2020-01-15 10:27:15 +01:00
parent e98fa891fe
commit b04f68553e
7 changed files with 63 additions and 36 deletions
+18 -7
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
""" """
Open a shell over MAVLink. Open a shell over MAVLink.
@@ -11,16 +11,27 @@ from __future__ import print_function
import sys, select import sys, select
import termios import termios
from timeit import default_timer as timer from timeit import default_timer as timer
from argparse import ArgumentParser
try: try:
from pymavlink import mavutil from pymavlink import mavutil
import serial except ImportError as e:
except: print("Failed to import pymavlink: " + e)
print("Failed to import pymavlink.")
print("You may need to install it with 'pip install pymavlink pyserial'")
print("") print("")
raise print("You may need to install it with:")
from argparse import ArgumentParser print(" pip3 install --user pymavlink")
print("")
sys.exit(1)
try:
import serial
except ImportError as e:
print("Failed to import pyserial: " + e)
print("")
print("You may need to install it with:")
print(" pip3 install --user pyserial")
print("")
sys.exit(1)
class MavlinkSerialPort(): class MavlinkSerialPort():
+8 -6
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
""" """
Stream ULog data over MAVLink. Stream ULog data over MAVLink.
@@ -12,15 +12,17 @@ import sys, select, os
import datetime import datetime
from timeit import default_timer as timer from timeit import default_timer as timer
os.environ['MAVLINK20'] = '1' # The commands require mavlink 2 os.environ['MAVLINK20'] = '1' # The commands require mavlink 2
from argparse import ArgumentParser
try: try:
from pymavlink import mavutil from pymavlink import mavutil
except: except ImportError as e:
print("Failed to import pymavlink.") print("Failed to import pymavlink: " + e)
print("You may need to install it with 'pip install pymavlink pyserial'")
print("") print("")
raise print("You may need to install it with:")
from argparse import ArgumentParser print(" pip3 install --user pymavlink")
print("")
sys.exit(1)
class MavlinkLogStreaming(): class MavlinkLogStreaming():
+5 -2
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
############################################################################ ############################################################################
# #
# Copyright (c) 2012-2017 PX4 Development Team. All rights reserved. # Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
@@ -742,7 +742,10 @@ def main():
if not pyserial_installed: if not pyserial_installed:
print("Error: pyserial not installed!") print("Error: pyserial not installed!")
print(" (Install using: sudo pip install pyserial)") print("")
print("You may need to install it using:")
print(" pip3 install --user pyserial")
print("")
sys.exit(1) sys.exit(1)
# Load the firmware file # Load the firmware file
+7 -5
View File
@@ -1,4 +1,4 @@
#! /usr/bin/env python #!/usr/bin/env python3
""" Script to generate Serial (UART) parameters and the ROMFS startup script """ """ Script to generate Serial (UART) parameters and the ROMFS startup script """
from __future__ import print_function from __future__ import print_function
@@ -11,11 +11,13 @@ from jinja2 import Environment, FileSystemLoader
try: try:
import yaml import yaml
except: except ImportError as e:
print("Failed to import yaml.") print("Failed to import yaml: " + e)
print("You may need to install it with 'sudo pip install pyyaml'")
print("") print("")
raise print("You may need to install it using:")
print(" pip3 install --user pyyaml")
print("")
sys.exit(1)
## Configuration ## Configuration
+7 -4
View File
@@ -8,6 +8,7 @@ import codecs
import re import re
import colorsys import colorsys
import json import json
import sys
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
@@ -609,11 +610,13 @@ if args.output == 'json':
elif args.output == 'graphviz': elif args.output == 'graphviz':
try: try:
from graphviz import Digraph from graphviz import Digraph
except: except ImportError as e:
print("Failed to import graphviz.") print("Failed to import graphviz: " + e)
print("You may need to install it with 'pip install graphviz'")
print("") print("")
raise print("You may need to install it with:")
print(" pip3 install --user graphviz")
print("")
sys.exit(1)
output_graphviz = OutputGraphviz(graph) output_graphviz = OutputGraphviz(graph)
engine='fdp' # use neato or fdp engine='fdp' # use neato or fdp
output_graphviz.write(args.file+'.fv', engine=engine) output_graphviz.write(args.file+'.fv', engine=engine)
+6 -4
View File
@@ -16,11 +16,13 @@ import sys
try: try:
import requests import requests
except: except ImportError as e:
print("Failed to import requests.") print("Failed to import requests: " + e)
print("You may need to install it with 'pip install requests'")
print("") print("")
raise print("You may need to install it using:")
print(" pip3 install --user requests")
print("")
sys.exit(1)
SERVER = 'https://logs.px4.io' SERVER = 'https://logs.px4.io'
+12 -8
View File
@@ -9,19 +9,23 @@ import sys
try: try:
import yaml import yaml
except: except ImportError as e:
print("Failed to import yaml.") print("Failed to import yaml: " + e)
print("You may need to install it with 'sudo pip install pyyaml'")
print("") print("")
raise print("You may need to install it using:")
print(" pip3 install --user pyyaml")
print("")
sys.exit(1)
try: try:
import cerberus import cerberus
except: except ImportError as e:
print("Failed to import cerberus.") print("Failed to import cerberus: " + e)
print("You may need to install it with 'sudo pip install cerberus'")
print("") print("")
raise print("You may need to install it using:")
print(" pip3 install --user cerberus")
print("")
sys.exit(1)
parser = argparse.ArgumentParser(description='Validate YAML file(s) against a schema') parser = argparse.ArgumentParser(description='Validate YAML file(s) against a schema')