Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka into module_refactor

diff --git a/requirements.txt b/requirements.txt
index a2cfda99ff3f6d8be659c813fb1a6804fb06d66b..05a4eb82181797438de67a123d9037f227bf7d91 100755 (executable)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Adafruit-PlatformDetect
+Adafruit-PlatformDetect==1.4.5
 Adafruit-PureIO
 Jetson.GPIO; platform_machine=='aarch64'
 RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'

diff --git a/setup.py b/setup.py
index 9f1e8ef15decde313b6983a92cbf3805cb02306d..f38d5fa0e948bf6d93193ae75286bd9e14709554 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ setup(
     py_modules=['_bleio', 'analogio', 'bitbangio', 'board', 'busio', 'digitalio', 'micropython', 'pulseio', 'neopixel_write'],
     package_data={'adafruit_blinka.microcontroller.bcm283x.pulseio': ['libgpiod_pulsein']},
     install_requires=[
-        "Adafruit-PlatformDetect",
+        "Adafruit-PlatformDetect==1.4.5",
         "Adafruit-PureIO",
         "spidev>=3.4; sys_platform=='linux' and platform_machine!='mips'",
         "sysv_ipc; platform_system != 'Windows' and platform_machine != 'mips'",

diff --git a/src/_bleio.py b/src/_bleio.py
index 6423c274498b5ff98d6ef2fa848a47c7fd8b06bc..d6c1426dd7dae309595ce4142a4b2fe49c0832f8 100755 (executable)
--- a/src/_bleio.py
+++ b/src/_bleio.py
@@ -1,6 +1,8 @@
 """This is a stub of _bleio for use in GitHub Actions CI. It is NOT meant to provide _bleio
    functionality in CPython."""
 
+adapter = None
+
 class Attribute:
     NO_ACCESS = 0
     OPEN = 0
@@ -14,6 +16,19 @@ class UUID:
     def __init__(self, uuid):
         pass
 
+class Descriptor:
+    @staticmethod
+    def add_to_characteristic(characteristic, uuid, *, read_perm=Attribute.OPEN,
+                              write_perm=Attribute.OPEN, max_length=20, fixed_length=False,
+                              initial_value=b''):
+        pass
+
+class CharacteristicBuffer:
+    pass
+
+class PacketBuffer:
+    pass
+
 class Characteristic:
     BROADCAST = 0
     READ = 0
@@ -21,3 +36,11 @@ class Characteristic:
     NOTIFY = 0
     INDICATE = 0
     WRITE_NO_RESPONSE = 0
+
+    @staticmethod
+    def add_to_service(service, uuid, *, properties=0, read_perm=Attribute.OPEN,
+                       write_perm=Attribute.OPEN, max_length=20, fixed_length=False,
+                       initial_value=None):
+        raise NotImplementedError()
+
+