From 621f9521a8b7f897a98a7aaba7adb43371b0db92 Mon Sep 17 00:00:00 2001 From: Samuel Sadok Date: Mon, 18 Jun 2018 11:54:41 +0200 Subject: [PATCH] remove install-time PySerial dependency and don't fail if installed as non-root --- Firmware/fibre/python/fibre/discovery.py | 1 - tools/setup.py | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/fibre/python/fibre/discovery.py b/Firmware/fibre/python/fibre/discovery.py index 1350f33d..4f1eda77 100644 --- a/Firmware/fibre/python/fibre/discovery.py +++ b/Firmware/fibre/python/fibre/discovery.py @@ -10,7 +10,6 @@ import traceback import fibre.protocol import fibre.utils import fibre.remote_object -import fibre.serial_transport from fibre.utils import Event, Logger from fibre.protocol import ChannelBrokenException diff --git a/tools/setup.py b/tools/setup.py index 126f09b6..80f4cc34 100644 --- a/tools/setup.py +++ b/tools/setup.py @@ -74,7 +74,10 @@ if not creating_package: if platform.system() == 'Linux': import odrive.utils from fibre.utils import Logger - odrive.utils.setup_udev_rules(Logger()) + try: + odrive.utils.setup_udev_rules(Logger()) + except PermissionError: + print("Warning: could not set up udev rules. Run `sudo odrivetool udev-setup` to try again.") setup( name = 'odrive',