merge main. fix pylint issues

adafruit_dps310/basic.py

@@ -38,7 +38,7 @@
 import math
 from time import sleep
 from micropython import const
-import adafruit_bus_device.i2c_device as i2c_device
+from adafruit_bus_device import i2c_device
 from adafruit_register.i2c_struct import UnaryStruct, ROUnaryStruct
 from adafruit_register.i2c_bit import RWBit, ROBit
 from adafruit_register.i2c_bits import RWBits, ROBits

examples/dps310_simpletest.py

@@ -1,9 +1,9 @@
 # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
 # SPDX-License-Identifier: MIT
 
-from adafruit_dps310.basic import DPS310
 import time
 import board
+from adafruit_dps310.basic import DPS310
 
 i2c = board.I2C()  # uses board.SCL and board.SDA
 dps310 = DPS310(i2c)