From a01bcf4c7b444e61981b48aae5b0a2d6d3b654ac Mon Sep 17 00:00:00 2001 From: David Glaude Date: Sat, 25 Jul 2020 19:59:18 +0200 Subject: [PATCH 1/6] Update adafruit_pm25.py Move the import (next pylint will have to ignore this --- adafruit_pm25.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_pm25.py b/adafruit_pm25.py index ea22c6a..2afc759 100644 --- a/adafruit_pm25.py +++ b/adafruit_pm25.py @@ -46,7 +46,6 @@ # imports import time import struct -from adafruit_bus_device.i2c_device import I2CDevice from digitalio import Direction __version__ = "0.0.0-auto.0" @@ -123,6 +122,7 @@ class PM25_I2C(PM25): """ A driver for the PM2.5 Air quality sensor over I2C """ +from adafruit_bus_device.i2c_device import I2CDevice def __init__(self, i2c_bus, reset_pin=None, address=0x12): if reset_pin: From ea37587eca9392427aa5d0df82a7a9434e7524b9 Mon Sep 17 00:00:00 2001 From: David Glaude Date: Sat, 25 Jul 2020 20:12:32 +0200 Subject: [PATCH 2/6] Update adafruit_pm25.py align --- adafruit_pm25.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_pm25.py b/adafruit_pm25.py index 2afc759..a661dd7 100644 --- a/adafruit_pm25.py +++ b/adafruit_pm25.py @@ -122,7 +122,7 @@ class PM25_I2C(PM25): """ A driver for the PM2.5 Air quality sensor over I2C """ -from adafruit_bus_device.i2c_device import I2CDevice + from adafruit_bus_device.i2c_device import I2CDevice def __init__(self, i2c_bus, reset_pin=None, address=0x12): if reset_pin: From bc1476a5f67e28ffc111cce7072f4c68d04718f2 Mon Sep 17 00:00:00 2001 From: David Glaude Date: Sat, 25 Jul 2020 20:47:08 +0200 Subject: [PATCH 3/6] Cannot find the right spot for the import... This seems to work as far as I can test... but it is supposed to be not recommended. And next I need to fight pylint... --- adafruit_pm25.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_pm25.py b/adafruit_pm25.py index a661dd7..22f8390 100644 --- a/adafruit_pm25.py +++ b/adafruit_pm25.py @@ -122,9 +122,9 @@ class PM25_I2C(PM25): """ A driver for the PM2.5 Air quality sensor over I2C """ - from adafruit_bus_device.i2c_device import I2CDevice def __init__(self, i2c_bus, reset_pin=None, address=0x12): + from adafruit_bus_device.i2c_device import I2CDevice if reset_pin: # Reset device reset_pin.direction = Direction.OUTPUT From 1c20f2fda4c58922624967a1ae07fa358f92e5c7 Mon Sep 17 00:00:00 2001 From: David Glaude Date: Sat, 25 Jul 2020 23:27:50 +0200 Subject: [PATCH 4/6] Update adafruit_pm25.py This keep pylint happy. --- adafruit_pm25.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_pm25.py b/adafruit_pm25.py index 22f8390..356347f 100644 --- a/adafruit_pm25.py +++ b/adafruit_pm25.py @@ -124,7 +124,7 @@ class PM25_I2C(PM25): """ def __init__(self, i2c_bus, reset_pin=None, address=0x12): - from adafruit_bus_device.i2c_device import I2CDevice + from adafruit_bus_device.i2c_device import I2CDevice # pylint: disable=import-outside-toplevel if reset_pin: # Reset device reset_pin.direction = Direction.OUTPUT From b3bfffefb0cf5fa9314e49ea48a6f3d356935e4a Mon Sep 17 00:00:00 2001 From: David Glaude Date: Sun, 26 Jul 2020 00:38:41 +0200 Subject: [PATCH 5/6] Make Black happy. This is Black recommendation... not sure I like it. --- adafruit_pm25.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adafruit_pm25.py b/adafruit_pm25.py index 356347f..ed41e18 100644 --- a/adafruit_pm25.py +++ b/adafruit_pm25.py @@ -124,7 +124,10 @@ class PM25_I2C(PM25): """ def __init__(self, i2c_bus, reset_pin=None, address=0x12): - from adafruit_bus_device.i2c_device import I2CDevice # pylint: disable=import-outside-toplevel + from adafruit_bus_device.i2c_device import ( + I2CDevice, + ) # pylint: disable=import-outside-toplevel + if reset_pin: # Reset device reset_pin.direction = Direction.OUTPUT From 042033ed08361b939d56ff30db7f7697b3c3c2aa Mon Sep 17 00:00:00 2001 From: David Glaude Date: Sun, 26 Jul 2020 00:53:37 +0200 Subject: [PATCH 6/6] Impossible to have pylint and black agree... I have to cheat for both. --- adafruit_pm25.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_pm25.py b/adafruit_pm25.py index ed41e18..967c14b 100644 --- a/adafruit_pm25.py +++ b/adafruit_pm25.py @@ -124,9 +124,9 @@ class PM25_I2C(PM25): """ def __init__(self, i2c_bus, reset_pin=None, address=0x12): - from adafruit_bus_device.i2c_device import ( - I2CDevice, - ) # pylint: disable=import-outside-toplevel + # fmt: off + from adafruit_bus_device.i2c_device import I2CDevice # pylint: disable=import-outside-toplevel + # fmt: on if reset_pin: # Reset device