commit a3887e95aa55d8738445133f896ad4b75b54b9d0 · pyrox.dev/nixpkgs

+51 -28

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         xorg,

     

       6
       6
       -
         pytest,

     

       5
       5
       +
         coreutils,

     

       6
       6
       +
         setuptools,

     

       7
       7
       +
         xlib,

     

       8
       8
       +
         fontconfig,

     

       9
       9
       +
         pytestCheckHook,

     

       10
       10
       +
         writableTmpDirAsHomeHook,

     

       11
       11
       +
         pytest-asyncio,

     

       12
       12
       +
         pytest-timeout,

     

       7
       13
        
         pytest-xvfb,

     

       8
       14
        
         i3,

     

       9
       9
       -
         xlib,

     

       10
       10
       -
         xdpyinfo,

     

       11
       11
       -
         makeFontsConf,

     

       12
       12
       -
         coreutils,

     

       15
       15
       +
         xorg,

     

       13
       16
        
       }:

     

       14
       17
        
       

     

       15
       18
        
       buildPythonPackage rec {

     

       16
       19
        
         pname = "i3ipc";

     

       17
       20
        
         version = "2.2.1";

     

       18
       18
       -
         format = "setuptools";

     

       21
       21
       +
         pyproject = true;

     

       19
       22
        
       

     

       20
       23
        
         src = fetchFromGitHub {

     

       21
       21
       -
           owner = "acrisci";

     

       24
       24
       +
           owner = "altdesktop";

     

       22
       25
        
           repo = "i3ipc-python";

     

       23
       23
       -
           rev = "v${version}";

     

       24
       24
       -
           sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715";

     

       26
       26
       +
           tag = "v${version}";

     

       27
       27
       +
           hash = "sha256-JRwipvIF1zL/x2A+xEJKEFV6BlDnv2Xt/eyIzVrSf40=";

     

       25
       28
        
         };

     

       26
       26
       -
         propagatedBuildInputs = [ xlib ];

     

       29
       29
       +
       

     

       30
       30
       +
         patches = [

     

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

     

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

     

       33
       33
       +
           # where needed.

     

       34
       34
       +
           ./fix-async-tests.patch

     

       35
       35
       +
         ];

     

       36
       36
       +
       

     

       37
       37
       +
         postPatch = ''

     

       38
       38
       +
           substituteInPlace test/i3.config \

     

       39
       39
       +
             --replace-fail /bin/true ${coreutils}/bin/true

     

       40
       40
       +
         '';

     

       41
       41
       +
       

     

       42
       42
       +
         build-system = [ setuptools ];

     

       43
       43
       +
         dependencies = [ xlib ];

     

       44
       44
       +
       

     

       45
       45
       +
         # Fontconfig error: Cannot load default config file

     

       46
       46
       +
         env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";

     

       27
       47
        
       

     

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

     

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

     

       30
       48
        
         nativeCheckInputs = [

     

       31
       31
       -
           pytest

     

       32
       32
       -
           xdpyinfo

     

       49
       49
       +
           pytestCheckHook

     

       50
       50
       +
           writableTmpDirAsHomeHook

     

       51
       51
       +
           pytest-asyncio

     

       52
       52
       +
           pytest-timeout

     

       33
       53
        
           pytest-xvfb

     

       54
       54
       +
           i3

     

       55
       55
       +
           xorg.xdpyinfo

     

       34
       56
        
           xorg.xvfb

     

       35
       35
       -
           i3

     

       36
       57
        
         ];

     

       37
       58
        
       

     

       38
       38
       -
         postPatch = ''

     

       39
       39
       -
           substituteInPlace test/i3.config \

     

       40
       40
       -
             --replace /bin/true ${coreutils}/bin/true

     

       41
       41
       -
         '';

     

       59
       59
       +
         disabledTestPaths = [

     

       60
       60
       +
           # Timeout

     

       61
       61
       +
           "test/test_shutdown_event.py::TestShutdownEvent::test_shutdown_event_reconnect"

     

       62
       62
       +
           "test/aio/test_shutdown_event.py::TestShutdownEvent::test_shutdown_event_reconnect"

     

       63
       63
       +
           # Flaky

     

       64
       64
       +
           "test/test_window.py::TestWindow::test_detailed_window_event"

     

       65
       65
       +
           "test/aio/test_workspace.py::TestWorkspace::test_workspace"

     

       66
       66
       +
         ];

     

       42
       67
        
       

     

       43
       43
       -
         checkPhase = ''

     

       44
       44
       -
           py.test --ignore=test/aio/test_shutdown_event.py \

     

       45
       45
       -
                   --ignore=test/test_shutdown_event.py

     

       46
       46
       -
         '';

     

       68
       68
       +
         pythonImportsCheck = [ "i3ipc" ];

     

       47
       69
        
       

     

       48
       48
       -
         meta = with lib; {

     

       70
       70
       +
         meta = {

     

       49
       71
        
           description = "Improved Python library to control i3wm and sway";

     

       50
       50
       -
           homepage = "https://github.com/acrisci/i3ipc-python";

     

       51
       51
       -
           license = licenses.bsd3;

     

       52
       52
       -
           maintainers = with maintainers; [ vanzef ];

     

       72
       72
       +
           homepage = "https://github.com/altdesktop/i3ipc-python";

     

       73
       73
       +
           changelog = "https://github.com/altdesktop/i3ipc-python/releases/tag/${src.tag}";

     

       74
       74
       +
           license = lib.licenses.bsd3;

     

       75
       75
       +
           maintainers = with lib.maintainers; [ vanzef ];

     

       53
       76
        
         };

     

       54
       77
        
       }

+28

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

···

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

     

       2
       2
       +
       index 88e4cda..3d0fd9c 100644

     

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

     

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

     

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

     

       6
       6
       +
        from subprocess import Popen

     

       7
       7
       +
        import pytest

     

       8
       8
       +
       +import pytest_asyncio

     

       9
       9
       +
        

     

       10
       10
       +
        from i3ipc.aio import Connection

     

       11
       11
       +
        from i3ipc import CommandReply

     

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

     

       13
       13
       +
            def event_loop(self):

     

       14
       14
       +
                return asyncio.get_event_loop()

     

       15
       15
       +
        

     

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

     

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

     

       18
       18
       +
            async def i3(self):

     

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

     

       20
       20
       +
                # wait for i3 to start up

     

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

     

       22
       22
       +
       index 1ea6b80..788bdac 100644

     

       23
       23
       +
       --- a/pytest.ini

     

       24
       24
       +
       +++ b/pytest.ini

     

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

     

       26
       26
       +
        [pytest]

     

       27
       27
       +
        timeout = 5

     

       28
       28
       +
       +asyncio_default_test_loop_scope = class