From 5070bd50b0583968ebe9d65dc8d186fc5fe5e391 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 May 2024 09:54:26 +0200 Subject: [PATCH 1/3] python312Packages.gipc: refactor --- .../python-modules/gipc/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 297b6c9865de..462f7d335398 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -3,12 +3,16 @@ , fetchFromGitHub , gevent , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "gipc"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jgehrcke"; @@ -19,10 +23,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "gevent>=1.5,<=21.12.0" "gevent>=1.5" + --replace-fail "gevent>=1.5,<=21.12.0" "gevent>=1.5" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ gevent ]; @@ -30,6 +38,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "gipc" + ]; + meta = with lib; { description = "gevent-cooperative child processes and IPC"; longDescription = '' @@ -42,6 +54,6 @@ buildPythonPackage rec { ''; homepage = "http://gehrcke.de/gipc"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From 281ee7d5b1fdcbc654761890c1a3477714bb5cc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 May 2024 10:01:57 +0200 Subject: [PATCH 2/3] python312Packages.gipc: 1.4.0 -> 1.6.0 Changelog: https://github.com/jgehrcke/gipc/blob/1.6.0/CHANGELOG.rst --- .../python-modules/gipc/default.nix | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 462f7d335398..efa665ac70ea 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "gipc"; - version = "1.4.0"; + version = "1.6.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jgehrcke"; repo = "gipc"; rev = "refs/tags/${version}"; - hash = "sha256-T5TqLanODyzJGyjDZz+75bbz3THxoobYnfJFQxAB76E="; + hash = "sha256-eYE7A1VDJ0NSshvdJKxPwGyVdW6BnyWoRSR1i1iTr8Y="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail "gevent>=1.5,<=21.12.0" "gevent>=1.5" + --replace-fail "gevent>=1.5,<=23.9.1" "gevent>=1.5" ''; build-system = [ @@ -42,6 +42,25 @@ buildPythonPackage rec { "gipc" ]; + disabledTests = [ + # + "test_singlemsg" + "test_singlemsg" + "test_all_handles_length" + "test_write_closewrite_read" + "test_handlecount" + "test_twochannels_singlemsg" + "test_onewriter" + "test_twowriters" + "test_twoclose" + "test_closewrite" + "test_closeread" + "test_readclose" + "test_child" + "test_handler" + "test_early_readchild_exit" + ]; + meta = with lib; { description = "gevent-cooperative child processes and IPC"; longDescription = '' @@ -53,6 +72,7 @@ buildPythonPackage rec { anywhere within your gevent-powered application. ''; homepage = "http://gehrcke.de/gipc"; + changelog = "https://github.com/jgehrcke/gipc/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 0f3bf95b8d003f3ab9e7684691fa8f432434364c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 May 2024 10:06:30 +0200 Subject: [PATCH 3/3] python312Packages.gipc: format with nixfmt --- .../python-modules/gipc/default.nix | 56 ++++++++----------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index efa665ac70ea..7a0529cc89af 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, gevent -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gevent, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -26,39 +27,30 @@ buildPythonPackage rec { --replace-fail "gevent>=1.5,<=23.9.1" "gevent>=1.5" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - gevent - ]; + dependencies = [ gevent ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "gipc" - ]; + pythonImportsCheck = [ "gipc" ]; disabledTests = [ - # - "test_singlemsg" - "test_singlemsg" + # AttributeError "test_all_handles_length" - "test_write_closewrite_read" - "test_handlecount" - "test_twochannels_singlemsg" - "test_onewriter" - "test_twowriters" - "test_twoclose" - "test_closewrite" - "test_closeread" - "test_readclose" "test_child" - "test_handler" + "test_closeread" + "test_closewrite" "test_early_readchild_exit" + "test_handlecount" + "test_handler" + "test_onewriter" + "test_readclose" + "test_singlemsg" + "test_twochannels_singlemsg" + "test_twoclose" + "test_twowriters" + "test_write_closewrite_read" ]; meta = with lib; {