commit 7db5a1c7ed61378c06841efc3d4da8ca98ce2eba · pyrox.dev/nixpkgs

+10

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

···

       4
        
         fetchFromGitHub,

     

       5
        
         xorg,

     

       6
        
         pytest,

     

       0
        
       
     

       7
        
         pytest-xvfb,

     

       8
        
         i3,

     

       9
        
         xlib,

     
···

       23
        
           rev = "v${version}";

     

       24
        
           sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715";

     

       25
        
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       26
        
         propagatedBuildInputs = [ xlib ];

     

       27
        
       

     

       28
        
         fontsConf = makeFontsConf { fontDirectories = [ ]; };

     

       29
        
         FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file

     

       30
        
         nativeCheckInputs = [

     

       31
        
           pytest

     

       0
        
       
     

       32
        
           xdpyinfo

     

       33
        
           pytest-xvfb

     

       34
        
           xorg.xvfb

···

       4
        
         fetchFromGitHub,

     

       5
        
         xorg,

     

       6
        
         pytest,

     

       7
       +
         pytest-asyncio,

     

       8
        
         pytest-xvfb,

     

       9
        
         i3,

     

       10
        
         xlib,

     
···

       24
        
           rev = "v${version}";

     

       25
        
           sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715";

     

       26
        
         };

     

       27
       +
       

     

       28
       +
         patches = [

     

       29
       +
           # Upstream expects a very old version of pytest-asyncio. This patch correctly

     

       30
       +
           # decorates async fixtures using pytest-asyncio and configures `loop_scope`

     

       31
       +
           # where needed.

     

       32
       +
           ./fix-async-tests.patch

     

       33
       +
         ];

     

       34
       +
       

     

       35
        
         propagatedBuildInputs = [ xlib ];

     

       36
        
       

     

       37
        
         fontsConf = makeFontsConf { fontDirectories = [ ]; };

     

       38
        
         FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file

     

       39
        
         nativeCheckInputs = [

     

       40
        
           pytest

     

       41
       +
           pytest-asyncio

     

       42
        
           xdpyinfo

     

       43
        
           pytest-xvfb

     

       44
        
           xorg.xvfb

+28

pkgs/development/python-modules/i3ipc/fix-async-tests.patch

···

       1
       +
       diff --git a/test/aio/ipctest.py b/test/aio/ipctest.py

     

       2
       +
       index 88e4cda..3d0fd9c 100644

     

       3
       +
       --- a/test/aio/ipctest.py

     

       4
       +
       +++ b/test/aio/ipctest.py

     

       5
       +
       @@ -1,5 +1,6 @@

     

       6
       +
        from subprocess import Popen

     

       7
       +
        import pytest

     

       8
       +
       +import pytest_asyncio

     

       9
       +
        

     

       10
       +
        from i3ipc.aio import Connection

     

       11
       +
        from i3ipc import CommandReply

     

       12
       +
       @@ -19,7 +20,7 @@ class IpcTest:

     

       13
       +
            def event_loop(self):

     

       14
       +
                return asyncio.get_event_loop()

     

       15
       +
        

     

       16
       +
       -    @pytest.fixture(scope='class')

     

       17
       +
       +    @pytest_asyncio.fixture(scope='class', loop_scope='class')

     

       18
       +
            async def i3(self):

     

       19
       +
                process = Popen(['i3', '-c', 'test/i3.config'])

     

       20
       +
                # wait for i3 to start up

     

       21
       +
       diff --git a/pytest.ini b/pytest.ini

     

       22
       +
       index 1ea6b80..788bdac 100644

     

       23
       +
       --- a/pytest.ini

     

       24
       +
       +++ b/pytest.ini

     

       25
       +
       @@ -1,2 +1,3 @@

     

       26
       +
        [pytest]

     

       27
       +
        timeout = 5

     

       28
       +
       +asyncio_default_test_loop_scope = class