commit d3e1b7e11dfee5cd2521749ac3d9d52c3e882a50 · pyrox.dev/nixpkgs

+39

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

···

       1
       +
       diff --git a/tests/test_api.py b/tests/test_api.py

     

       2
       +
       index 3289252..30388b2 100644

     

       3
       +
       --- a/tests/test_api.py

     

       4
       +
       +++ b/tests/test_api.py

     

       5
       +
       @@ -25,7 +25,7 @@ DBUS_ERROR_UNKNOWN = BleakDBusError("org.bluez.Error.SomethingNotHandled", [])

     

       6
       +
        @pytest.fixture()

     

       7
       +
        def mock_client() -> MockSnoozClient:

     

       8
       +
            return MockSnoozClient(

     

       9
       +
       -        BLEDevice("Snooz-ABCD", "00:00:00:00:12:34", [], 0), SnoozDeviceModel.ORIGINAL

     

       10
       +
       +        BLEDevice("Snooz-ABCD", "00:00:00:00:12:34", []), SnoozDeviceModel.ORIGINAL

     

       11
       +
            )

     

       12
       +
        

     

       13
       +
        

     

       14
       +
       diff --git a/tests/test_device.py b/tests/test_device.py

     

       15
       +
       index f24a7c6..38240e4 100644

     

       16
       +
       --- a/tests/test_device.py

     

       17
       +
       +++ b/tests/test_device.py

     

       18
       +
       @@ -127,7 +127,7 @@ def snooz(

     

       19
       +
            model_name = (

     

       20
       +
                MODEL_NAME_BREEZ if model == SnoozDeviceModel.BREEZ else MODEL_NAME_SNOOZ

     

       21
       +
            )

     

       22
       +
       -    device = BLEDevice("AA:BB:CC:DD:EE:FF", f"{model_name}-EEFF", [], 0)

     

       23
       +
       +    device = BLEDevice("AA:BB:CC:DD:EE:FF", f"{model_name}-EEFF", [])

     

       24
       +
            password = "AABBCCDDEEFF"

     

       25
       +
            adv_data = SnoozAdvertisementData(

     

       26
       +
                model,

     

       27
       +
       diff --git a/tests/test_testing.py b/tests/test_testing.py

     

       28
       +
       index d8ce6f2..7a1002d 100644

     

       29
       +
       --- a/tests/test_testing.py

     

       30
       +
       +++ b/tests/test_testing.py

     

       31
       +
       @@ -22,7 +22,7 @@ from pysnooz.testing import MockSnoozClient, MockSnoozDevice

     

       32
       +
        

     

       33
       +
        from . import SUPPORTED_MODELS

     

       34
       +
        

     

       35
       +
       -TEST_BLE_DEVICE = BLEDevice("00:00:00:00:AB:CD", "Snooz-ABCD", [], 0)

     

       36
       +
       +TEST_BLE_DEVICE = BLEDevice("00:00:00:00:AB:CD", "Snooz-ABCD", [])

     

       37
       +
        

     

       38
       +
        

     

       39
       +
        @pytest.mark.asyncio

+10 -5

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

···

       20
        
       buildPythonPackage rec {

     

       21
        
         pname = "pysnooz";

     

       22
        
         version = "0.10.0";

     

       23
       -
         format = "pyproject";

     

       24
        
       

     

       25
        
         disabled = pythonOlder "3.9";

     

       26
        
       

     
···

       31
        
           hash = "sha256-jOXmaJprU35sdNRrBBx/YUyiDyyaE1qodWksXkTSEe0=";

     

       32
        
         };

     

       33
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       34
        
         postPatch = ''

     

       35
        
           substituteInPlace pyproject.toml \

     

       36
       -
             --replace 'transitions = "^0.8.11"' 'transitions = ">=0.8.11"' \

     

       37
       -
             --replace 'Events = "^0.4"' 'Events = ">=0.4"'

     

       38
        
         '';

     

       39
        
       

     

       40
       -
         nativeBuildInputs = [ poetry-core ];

     

       41
        
       

     

       42
       -
         propagatedBuildInputs = [

     

       43
        
           bleak

     

       44
        
           bleak-retry-connector

     

       45
        
           bluetooth-sensor-state-data

···

       20
        
       buildPythonPackage rec {

     

       21
        
         pname = "pysnooz";

     

       22
        
         version = "0.10.0";

     

       23
       +
         pyproject = true;

     

       24
        
       

     

       25
        
         disabled = pythonOlder "3.9";

     

       26
        
       

     
···

       31
        
           hash = "sha256-jOXmaJprU35sdNRrBBx/YUyiDyyaE1qodWksXkTSEe0=";

     

       32
        
         };

     

       33
        
       

     

       34
       +
         patches = [

     

       35
       +
           # https://github.com/AustinBrunkhorst/pysnooz/pull/20

     

       36
       +
           ./bleak-compat.patch

     

       37
       +
         ];

     

       38
       +
       

     

       39
        
         postPatch = ''

     

       40
        
           substituteInPlace pyproject.toml \

     

       41
       +
             --replace-fail 'transitions = "^0.8.11"' 'transitions = ">=0.8.11"' \

     

       42
       +
             --replace-fail 'Events = "^0.4"' 'Events = ">=0.4"'

     

       43
        
         '';

     

       44
        
       

     

       45
       +
         build-system = [ poetry-core ];

     

       46
        
       

     

       47
       +
         dependencies = [

     

       48
        
           bleak

     

       49
        
           bleak-retry-connector

     

       50
        
           bluetooth-sensor-state-data