commit bc07f2d847fb4031df488df8765aa6670f7cb55a · pyrox.dev/nixpkgs

+76

pkgs/development/python-modules/pyzerproc/bleak-compat.patch

···

       1
       1
       +
       diff --git a/pyzerproc/discovery.py b/pyzerproc/discovery.py

     

       2
       2
       +
       index e383996..1810bbe 100644

     

       3
       3
       +
       --- a/pyzerproc/discovery.py

     

       4
       4
       +
       +++ b/pyzerproc/discovery.py

     

       5
       5
       +
       @@ -4,6 +4,9 @@ import logging

     

       6
       6
       +
        from .light import Light

     

       7
       7
       +
        from .exceptions import ZerprocException

     

       8
       8
       +
        

     

       9
       9
       +
       +from bleak import BLEDevice, BleakScanner, AdvertisementData

     

       10
       10
       +
       +from bleak.exc import BleakError

     

       11
       11
       +
       +

     

       12
       12
       +
        _LOGGER = logging.getLogger(__name__)

     

       13
       13
       +
        

     

       14
       14
       +
        EXPECTED_SERVICES = [

     

       15
       15
       +
       @@ -13,27 +16,25 @@ EXPECTED_SERVICES = [

     

       16
       16
       +
        ]

     

       17
       17
       +
        

     

       18
       18
       +
        

     

       19
       19
       +
       -def is_valid_device(device):

     

       20
       20
       +
       +def is_valid_device(device: BLEDevice, advertisement_data: AdvertisementData):

     

       21
       21
       +
            """Returns true if the given device is a Zerproc light."""

     

       22
       22
       +
            for service in EXPECTED_SERVICES:

     

       23
       23
       +
       -        if service not in device.metadata['uuids']:

     

       24
       24
       +
       +        if service not in advertisement_data.service_uuids:

     

       25
       25
       +
                    return False

     

       26
       26
       +
            return True

     

       27
       27
       +
        

     

       28
       28
       +
        

     

       29
       29
       +
        async def discover(timeout=10):

     

       30
       30
       +
            """Returns nearby discovered lights."""

     

       31
       31
       +
       -    import bleak

     

       32
       32
       +
       -

     

       33
       33
       +
            _LOGGER.info("Starting scan for local devices")

     

       34
       34
       +
        

     

       35
       35
       +
            lights = []

     

       36
       36
       +
            try:

     

       37
       37
       +
       -        devices = await bleak.BleakScanner.discover(timeout=timeout)

     

       38
       38
       +
       -    except bleak.exc.BleakError as ex:

     

       39
       39
       +
       +        devices = await BleakScanner.discover(timeout=timeout, return_adv=True)

     

       40
       40
       +
       +    except BleakError as ex:

     

       41
       41
       +
                raise ZerprocException() from ex

     

       42
       42
       +
       -    for device in devices:

     

       43
       43
       +
       -        if is_valid_device(device):

     

       44
       44
       +
       +    for device, advertisement_data in devices:

     

       45
       45
       +
       +        if is_valid_device(device, advertisement_data):

     

       46
       46
       +
                    lights.append(Light(device.address, device.name))

     

       47
       47
       +
        

     

       48
       48
       +
            _LOGGER.info("Scan complete")

     

       49
       49
       +
       diff --git a/tests/test_discovery.py b/tests/test_discovery.py

     

       50
       50
       +
       index 7a1442d..6b271b8 100644

     

       51
       51
       +
       --- a/tests/test_discovery.py

     

       52
       52
       +
       +++ b/tests/test_discovery.py

     

       53
       53
       +
       @@ -16,7 +16,6 @@ async def test_discover_devices(scanner, client_class):

     

       54
       54
       +
                        'AA:BB:CC:11:22:33',

     

       55
       55
       +
                        'LEDBlue-CC112233',

     

       56
       56
       +
                        {},

     

       57
       57
       +
       -                0,

     

       58
       58
       +
                        uuids=[

     

       59
       59
       +
                            "0000ffe0-0000-1000-8000-00805f9b34fb",

     

       60
       60
       +
                            "0000ffe5-0000-1000-8000-00805f9b34fb",

     

       61
       61
       +
       @@ -27,7 +26,6 @@ async def test_discover_devices(scanner, client_class):

     

       62
       62
       +
                        'AA:BB:CC:44:55:66',

     

       63
       63
       +
                        'LEDBlue-CC445566',

     

       64
       64
       +
                        {},

     

       65
       65
       +
       -                0,

     

       66
       66
       +
                        uuids=[

     

       67
       67
       +
                            "0000ffe0-0000-1000-8000-00805f9b34fb",

     

       68
       68
       +
                            "0000ffe5-0000-1000-8000-00805f9b34fb",

     

       69
       69
       +
       @@ -38,7 +36,6 @@ async def test_discover_devices(scanner, client_class):

     

       70
       70
       +
                        'DD:EE:FF:11:22:33',

     

       71
       71
       +
                        'Other',

     

       72
       72
       +
                        {},

     

       73
       73
       +
       -                0,

     

       74
       74
       +
                        uuids=[

     

       75
       75
       +
                            "0000fe9f-0000-1000-8000-00805f9b34fb",

     

       76
       76
       +
                        ],

+8 -21

pkgs/development/python-modules/pyzerproc/default.nix

···

       4
       4
        
         click,

     

       5
       5
        
         buildPythonPackage,

     

       6
       6
        
         fetchFromGitHub,

     

       7
       7
       -
         pytest-asyncio,

     

       8
       8
       -
         pytest-mock,

     

       9
       9
       -
         pythonAtLeast,

     

       10
       10
       -
         pytest-cov-stub,

     

       11
       11
       -
         pytestCheckHook,

     

       12
       12
       -
         pythonOlder,

     

       7
       7
       +
         setuptools,

     

       13
       8
        
       }:

     

       14
       9
        
       

     

       15
       10
        
       buildPythonPackage rec {

     

       16
       11
        
         pname = "pyzerproc";

     

       17
       12
        
         version = "0.4.12";

     

       18
       18
       -
         format = "setuptools";

     

       19
       19
       -
       

     

       20
       20
       -
         disabled = pythonOlder "3.9";

     

       13
       13
       +
         pyproject = true;

     

       21
       14
        
       

     

       22
       15
        
         src = fetchFromGitHub {

     

       23
       16
        
           owner = "emlove";

     
···

       26
       19
        
           hash = "sha256-vS0sk/KjDhWispZvCuGlmVLLfeFymHqxwNzNqNRhg6k=";

     

       27
       20
        
         };

     

       28
       21
        
       

     

       29
       29
       -
         propagatedBuildInputs = [

     

       22
       22
       +
         patches = [ ./bleak-compat.patch ];

     

       23
       23
       +
       

     

       24
       24
       +
         build-system = [ setuptools ];

     

       25
       25
       +
       

     

       26
       26
       +
         dependencies = [

     

       30
       27
        
           bleak

     

       31
       28
        
           click

     

       32
       29
        
         ];

     

       33
       30
        
       

     

       34
       34
       -
         nativeCheckInputs = [

     

       35
       35
       -
           pytest-asyncio

     

       36
       36
       -
           pytest-mock

     

       37
       37
       -
           pytest-cov-stub

     

       38
       38
       -
           pytestCheckHook

     

       39
       39
       -
         ];

     

       40
       40
       -
       

     

       41
       41
       -
         disabledTestPaths = lib.optionals (pythonAtLeast "3.11") [

     

       42
       42
       -
           # unittest.mock.InvalidSpecError: Cannot spec a Mock object.

     

       43
       43
       -
           "tests/test_light.py"

     

       44
       44
       -
         ];

     

       31
       31
       +
         doCheck = false; # tries to access dbus, which leads to FileNotFoundError

     

       45
       32
        
       

     

       46
       33
        
         pythonImportsCheck = [ "pyzerproc" ];

     

       47
       34