Require Jetson.GPIO on aarch64

The Tegra pin.py files depend on the Jetson.GPIO library. Currently, they
assume the library is installed in /opt/nvidia/jetson-gpio and hard-code
this path. This doesn't work well when someone has installed an upgraded
version, e.g. via PYTHONPATH or pip. To solve this, remove the
hard-coding of Jetson.GPIO's installation path, and update setup.py and
requirements.txt to ensure that Jetson.GPIO is available. Note that
Jetson.GPIO is now available via PyPi, but may not have been when initial
Jetson support was added to Blinka.

diff --git a/requirements.txt b/requirements.txt
index daaff66ff22ca347f955b8c6ba0195d62ea8be12..b44ee7151b1f6c75166c2eaad5095eb18e1779ed 100755 (executable)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 Adafruit-PlatformDetect
 Adafruit-PureIO
 Adafruit-PlatformDetect
 Adafruit-PureIO

+Jetson.GPIO; platform_machine=='aarch64'

 RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'
 rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l'
 spidev; sys_platform == 'linux'
 RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'
 rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l'
 spidev; sys_platform == 'linux'

diff --git a/setup.py b/setup.py
index cb3549cb8057373c8fa75661d006e446f6decebb..57a5c39872e420bc994116a01b1654fd3d06e439 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@ setup(
     install_requires=[
         "Adafruit-PlatformDetect",
         "Adafruit-PureIO",
     install_requires=[
         "Adafruit-PlatformDetect",
         "Adafruit-PureIO",

+        "Jetson.GPIO; platform_machine=='aarch64'",

         "RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'",
         "rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l'",
         "spidev; sys_platform=='linux'",
         "RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'",
         "rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l'",
         "spidev; sys_platform=='linux'",

diff --git a/src/adafruit_blinka/microcontroller/tegra/t186/pin.py b/src/adafruit_blinka/microcontroller/tegra/t186/pin.py
index d14728355197496f857f83dcacae8f49d1eddf6a..f033b5c4149fbbf089ade427b5894491374bdcf7 100644 (file)
--- a/src/adafruit_blinka/microcontroller/tegra/t186/pin.py
+++ b/src/adafruit_blinka/microcontroller/tegra/t186/pin.py
@@ -1,7 +1,5 @@
 import sys
 import atexit
 import sys
 import atexit

-sys.path.append("/opt/nvidia/jetson-gpio/lib/python")
-sys.path.append("/opt/nvidia/jetson-gpio/lib/python/Jetson/GPIO")

 import Jetson.GPIO as GPIO
 GPIO.setmode(GPIO.TEGRA_SOC)
 GPIO.setwarnings(False)   # shh!
 import Jetson.GPIO as GPIO
 GPIO.setmode(GPIO.TEGRA_SOC)
 GPIO.setwarnings(False)   # shh!

diff --git a/src/adafruit_blinka/microcontroller/tegra/t194/pin.py b/src/adafruit_blinka/microcontroller/tegra/t194/pin.py
index 84972b42993a5d311068bf293ea5cc3e000ca0ab..971474e385d404f552010c176de12959ffdcc163 100644 (file)
--- a/src/adafruit_blinka/microcontroller/tegra/t194/pin.py
+++ b/src/adafruit_blinka/microcontroller/tegra/t194/pin.py
@@ -1,7 +1,5 @@
 import sys
 import atexit
 import sys
 import atexit

-sys.path.append("/opt/nvidia/jetson-gpio/lib/python")
-sys.path.append("/opt/nvidia/jetson-gpio/lib/python/Jetson/GPIO")

 import Jetson.GPIO as GPIO
 GPIO.setmode(GPIO.TEGRA_SOC)
 GPIO.setwarnings(False)   # shh!
 import Jetson.GPIO as GPIO
 GPIO.setmode(GPIO.TEGRA_SOC)
 GPIO.setwarnings(False)   # shh!

diff --git a/src/adafruit_blinka/microcontroller/tegra/t210/pin.py b/src/adafruit_blinka/microcontroller/tegra/t210/pin.py
index 3645297875a73fb55d1b1eea7ee880c96edb2c26..50e2daa45484078bf07c696f9e1dd0670e4e35de 100644 (file)
--- a/src/adafruit_blinka/microcontroller/tegra/t210/pin.py
+++ b/src/adafruit_blinka/microcontroller/tegra/t210/pin.py
@@ -1,7 +1,5 @@
 import sys
 import atexit
 import sys
 import atexit

-sys.path.append("/opt/nvidia/jetson-gpio/lib/python")
-sys.path.append("/opt/nvidia/jetson-gpio/lib/python/Jetson/GPIO")

 import Jetson.GPIO as GPIO
 GPIO.setmode(GPIO.TEGRA_SOC)
 GPIO.setwarnings(False)   # shh!
 import Jetson.GPIO as GPIO
 GPIO.setmode(GPIO.TEGRA_SOC)
 GPIO.setwarnings(False)   # shh!