From be9c69adbf3124994eaf5317d64a5a4e19fbfcf7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 15:43:46 +0200 Subject: [PATCH 1/5] python312Packages.async-stagger: 0.3.1 -> 0.4.0.post1 https://github.com/twisteroidambassador/async_stagger/compare/v0.3.1...v0.4.0.post1 --- .../python-modules/async-stagger/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/async-stagger/default.nix b/pkgs/development/python-modules/async-stagger/default.nix index 51c18ed36773..27bf138c375a 100644 --- a/pkgs/development/python-modules/async-stagger/default.nix +++ b/pkgs/development/python-modules/async-stagger/default.nix @@ -1,8 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, + setuptools, pytestCheckHook, pytest-asyncio, pytest-mock, @@ -10,17 +11,20 @@ buildPythonPackage rec { pname = "async-stagger"; - version = "0.3.1"; - format = "setuptools"; + version = "0.4.0.post1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.11"; - src = fetchPypi { - pname = "async_stagger"; - inherit version; - hash = "sha256-qp81fp79J36aUWqUvegSStXkZ+m8Zcn62qrJjpVqQ9Y="; + src = fetchFromGitHub { + owner = "twisteroidambassador"; + repo = "async_stagger"; + rev = "refs/tags/v${version}"; + hash = "sha256-uJohc3EsAKevqT0J+N0Cqop3xy0PCM5jsP6YYtx+HuQ="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook pytest-asyncio @@ -28,8 +32,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # RuntimeError: Logic bug in... - "test_stagger_coro_gen" + # "OSError: [Errno 0] fileno not supported" during teardown + "test_create_connected_sock_normal" ]; pythonImportsCheck = [ "async_stagger" ]; From e69ddddccabb47298ab9845272044e7b8a243594 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 15:44:45 +0200 Subject: [PATCH 2/5] python312Packages.ircstates: 0.12.1 -> 0.13.0 https://github.com/jesopo/ircstates/compare/v0.12.1...v0.13.0 --- .../python-modules/ircstates/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index ab28fb911aa3..3efe469fe093 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -2,36 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, irctokens, pendulum, freezegun, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "ircstates"; - version = "0.12.1"; - format = "setuptools"; - disabled = pythonOlder "3.6"; # f-strings + version = "0.13.0"; + pyproject = true; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - hash = "sha256-F9yOY3YBacyoUzNTvPs7pxp6yNx08tiq1jWQKhGiagc="; + hash = "sha256-Mq9aOj6PXzPjaz3ofoPcAbur59oUWffmEg8aHt0v+0Q="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ irctokens pendulum ]; - nativeCheckInputs = [ freezegun ]; - - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + nativeCheckInputs = [ + freezegun + unittestCheckHook + ]; pythonImportsCheck = [ "ircstates" ]; From e9ab916f523086de8c05ff295866763b3c87b845 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 15:50:09 +0200 Subject: [PATCH 3/5] python312Packages.irctokens: modernize --- .../python-modules/irctokens/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 5ad937806155..1e2b962d0f6a 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -3,14 +3,16 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, pyyaml, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "irctokens"; version = "2.0.2"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { @@ -20,10 +22,12 @@ buildPythonPackage rec { hash = "sha256-Y9NBqxGUkt48hnXxsmfydHkJmWWb+sRrElV8C7l9bpw="; }; - nativeCheckInputs = [ pyyaml ]; - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pyyaml + unittestCheckHook + ]; pythonImportsCheck = [ "irctokens" ]; From 663225ca5859d170e5d1b827d225130ac0b08361 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 16:01:28 +0200 Subject: [PATCH 4/5] python312Packages.ircrobots: modernize --- .../python-modules/ircrobots/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 370040f2b6fe..89e186f366db 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -2,21 +2,20 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, anyio, asyncio-rlock, asyncio-throttle, ircstates, async-stagger, async-timeout, - python, + unittestCheckHook, }: buildPythonPackage rec { pname = "ircrobots"; version = "0.6.6"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "jesopo"; @@ -25,10 +24,9 @@ buildPythonPackage rec { hash = "sha256-mIh3tERwHtGH9eA0AT8Lcnwp1Wn9lQhKkUjuZcOXO/c="; }; - postPatch = '' - # too specific pins https://github.com/jesopo/ircrobots/issues/3 - sed -iE 's/anyio.*/anyio/' requirements.txt - ''; + build-system = [ setuptools ]; + + pythonRelaxDeps = true; propagatedBuildInputs = [ anyio @@ -39,9 +37,7 @@ buildPythonPackage rec { async-timeout ]; - checkPhase = '' - ${python.interpreter} -m unittest test - ''; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "ircrobots" ]; From 2f733e239e1a3113f5b5e991a74eee91ecd5c8bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Oct 2024 00:04:47 +0200 Subject: [PATCH 5/5] python312Packages.ircrobots: 0.6.6 -> 0.7.2 https://github.com/jesopo/ircrobots/compare/v0.6.6...v0.7.2 --- pkgs/development/python-modules/ircrobots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index 89e186f366db..7fcb1280987f 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ircrobots"; - version = "0.6.6"; + version = "0.7.2"; pyproject = true; src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - hash = "sha256-mIh3tERwHtGH9eA0AT8Lcnwp1Wn9lQhKkUjuZcOXO/c="; + hash = "sha256-slz4AH2Mi21N3aV+OrnoXoQsseS7arW2NuUZARQJsf0="; }; build-system = [ setuptools ];