From 223fca4c723a9f5874d78a2685f8edcc375406bc Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 11 Feb 2022 08:42:23 -0500 Subject: [PATCH] restore adafruit-blinka requirement for type annotations --- adafruit_bus_device/i2c_device.py | 9 +++------ adafruit_bus_device/spi_device.py | 5 +++-- docs/conf.py | 2 +- requirements.txt | 5 +++++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/adafruit_bus_device/i2c_device.py b/adafruit_bus_device/i2c_device.py index 9c02b4b..fc538a7 100644 --- a/adafruit_bus_device/i2c_device.py +++ b/adafruit_bus_device/i2c_device.py @@ -10,15 +10,12 @@ try: from typing import Optional, Type from types import TracebackType - from busio import I2C - - try: - from circuitpython_typing import ReadableBuffer, WriteableBuffer - except ImportError: - from _typing import ReadableBuffer, WriteableBuffer + from circuitpython_typing import ReadableBuffer, WriteableBuffer except ImportError: pass +from busio import I2C + __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git" diff --git a/adafruit_bus_device/spi_device.py b/adafruit_bus_device/spi_device.py index 58c948c..0460a75 100644 --- a/adafruit_bus_device/spi_device.py +++ b/adafruit_bus_device/spi_device.py @@ -12,11 +12,12 @@ try: from typing import Optional, Type from types import TracebackType - from busio import SPI - from digitalio import DigitalInOut except ImportError: pass +from busio import SPI +from digitalio import DigitalInOut + __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git" diff --git a/docs/conf.py b/docs/conf.py index 42eb1b2..79bb425 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -23,7 +23,7 @@ # Uncomment the below if you use native CircuitPython modules such as # digitalio, micropython and busio. List the modules you use. Without it, the # autodoc module docs will fail to generate with a warning. -autodoc_mock_imports = ["busio", "digitalio", "circuitpython_typing", "_typing"] +autodoc_mock_imports = ["busio", "digitalio", "circuitpython_typing"] intersphinx_mapping = { "python": ("https://docs.python.org/3", None), diff --git a/requirements.txt b/requirements.txt index e69de29..44dff74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: 2020 ladyada for Adafruit Industries +# +# SPDX-License-Identifier: Unlicense + +adafruit-blinka