From 47460504193652c97f8c2314fee66c69bddbb821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Apr 2026 07:06:43 -0700 Subject: [PATCH 1/3] python3Packages.pamqp: 3.3.0 -> 4.0.0 Diff: https://github.com/gmr/pamqp/compare/3.3.0...4.0.0 Changelog: https://github.com/gmr/pamqp/blob/4.0.0/docs/changelog.rst --- pkgs/development/python-modules/pamqp/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 86accde29c63..d5bd70dd3192 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -2,12 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + hatchling, pytestCheckHook, }: buildPythonPackage rec { - version = "3.3.0"; + version = "4.0.0"; pname = "pamqp"; pyproject = true; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gmr"; repo = "pamqp"; - rev = version; - hash = "sha256-0vjiPBLd8afnATjmV2sINsBd4j7L544u5DA3jLiLSsY="; + tag = version; + hash = "sha256-0rRVbzC5G+lH6Okvw8PtoPZKD8LlobAGYvDEIDw0aFo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/gmr/pamqp/blob/${src.rev}/docs/changelog.rst"; + changelog = "https://github.com/gmr/pamqp/blob/${src.tag}/docs/changelog.rst"; description = "RabbitMQ Focused AMQP low-level library"; homepage = "https://github.com/gmr/pamqp"; license = lib.licenses.bsd3; From 4cd94659826a441cfe9546fbfc979905c3bfd362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Apr 2026 07:12:17 -0700 Subject: [PATCH 2/3] python3Packages.aiormq: 6.9.2 -> 9.6.4 Diff: https://github.com/mosquito/aiormq/compare/6.9.2...9.6.4 Changelog: https://github.com/mosquito/aiormq/releases/tag/9.6.4 --- .../python-modules/aiormq/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index b06dc5fa3007..31e7a30b6fa2 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -1,44 +1,41 @@ { lib, - aiomisc-pytest, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pamqp, + uv-build, yarl, - poetry-core, }: buildPythonPackage rec { pname = "aiormq"; - version = "6.9.2"; + version = "9.6.4"; pyproject = true; src = fetchFromGitHub { owner = "mosquito"; repo = "aiormq"; tag = version; - hash = "sha256-ApwL3okhpc3Dtq4bfWCCnoikyRx+4zPI9XtJ+qPKQdg="; + hash = "sha256-GFeOwjSQ1+nxP9hgNoELoEInTmhhO0JnNeoe2qfWNcg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "uv_build>=0.10.4,<0.11.0" uv_build + ''; + pythonRelaxDeps = [ "pamqp" ]; - build-system = [ poetry-core ]; + build-system = [ uv-build ]; dependencies = [ pamqp yarl ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ aiomisc-pytest ]; - - # Tests attempt to connect to a RabbitMQ server - disabledTestPaths = [ - "tests/test_channel.py" - "tests/test_connection.py" - ]; + # Tests require running a RabbitMQ server. + # They rely on having AMQP_URL set or running Docker. + doCheck = false; pythonImportsCheck = [ "aiormq" ]; From f9ba31af4ebc45c1a18dfeb43a14ff391a2ed422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Apr 2026 07:21:29 -0700 Subject: [PATCH 3/3] python3Packages.aio-pika: 9.5.8 -> 9.6.2 Diff: https://github.com/mosquito/aio-pika/compare/9.5.8...9.6.2 Changelog: https://github.com/mosquito/aio-pika/blob/9.6.2/CHANGELOG.md --- .../python-modules/aio-pika/default.nix | 52 +++++-------------- 1 file changed, 12 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index d8fb770699ce..c795828767e3 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -1,67 +1,39 @@ { lib, - aiomisc-pytest, aiormq, buildPythonPackage, - docker, fetchFromGitHub, - pamqp, - poetry-core, - pytestCheckHook, - shortuuid, - testcontainers, - wrapt, + uv-build, yarl, }: buildPythonPackage rec { pname = "aio-pika"; - version = "9.5.8"; + version = "9.6.2"; pyproject = true; src = fetchFromGitHub { owner = "mosquito"; repo = "aio-pika"; tag = version; - hash = "sha256-0jVxgU+r/d2n4YO5/YAZrZUWDCAlZldBshCGpcEV/sQ="; + hash = "sha256-N5MjFIolMRTTn4aV1NskBwonB/8FSuEZETumUrAa02Y="; }; - build-system = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.26,<0.10.0" uv_build + ''; + + build-system = [ uv-build ]; dependencies = [ aiormq yarl ]; - nativeCheckInputs = [ - aiomisc-pytest - docker - pamqp - pytestCheckHook - shortuuid - testcontainers - wrapt - ]; - - disabledTests = [ - # Tests attempt to connect to a RabbitMQ server - "test_connection_interleave" - "test_connection_happy_eyeballs_delay" - "test_robust_connection_interleave" - "test_robust_connection_happy_eyeballs_delay" - ]; - - disabledTestPaths = [ - # Tests attempt to connect to a RabbitMQ server - "tests/test_amqp.py" - "tests/test_amqp_robust.py" - "tests/test_amqp_robust_proxy.py" - "tests/test_amqps.py" - "tests/test_master.py" - "tests/test_memory_leak.py" - "tests/test_rpc.py" - "tests/test_types.py" - ]; + # Tests require running a RabbitMQ server. + # They rely on having AMQP_URL set or running Docker. + doCheck = false; pythonImportsCheck = [ "aio_pika" ];