From 0b1975787e35a8bc5ac32dd00f6878b2278b0e55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 17:15:40 +0200 Subject: [PATCH 1/3] python312Packages.aio-pika: 9.4.0 -> 9.4.1 Changelog: https://github.com/mosquito/aio-pika/blob/9.4.1/CHANGELOG.md --- .../python-modules/aio-pika/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 65f15fa639d5..27fce9dea73e 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -2,27 +2,30 @@ , aiomisc-pytest , aiormq , buildPythonPackage +, docker , fetchFromGitHub , pamqp , poetry-core , pytestCheckHook , pythonOlder , shortuuid +, testcontainers +, wrapt , yarl }: buildPythonPackage rec { pname = "aio-pika"; - version = "9.4.0"; + version = "9.4.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mosquito"; repo = "aio-pika"; rev = "refs/tags/${version}"; - hash = "sha256-EntV/CBvT4II4nxsVe3KjNA4EPV7Oc6h2G0fX0fHKTU="; + hash = "sha256-aRXYFW4fl3iXH3bwP30+TllRm4BkIUcGMX/lNfhiqjo="; }; nativeBuildInputs = [ @@ -36,9 +39,20 @@ buildPythonPackage rec { 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 = [ From 1f51584b8ae73bc4e969d1470ff2335c71bae533 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 18:21:16 +0200 Subject: [PATCH 2/3] python312Packages.aio-pika: refactor --- pkgs/development/python-modules/aio-pika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 27fce9dea73e..89c09540fb46 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { hash = "sha256-aRXYFW4fl3iXH3bwP30+TllRm4BkIUcGMX/lNfhiqjo="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiormq yarl ]; From 0a7fb613f2e8732ab0bb9ebb2fe83d69d7801e6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 18:21:39 +0200 Subject: [PATCH 3/3] python312Packages.aio-pika: format with nixfmt --- .../python-modules/aio-pika/default.nix | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 89c09540fb46..10c311c220c9 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -1,17 +1,18 @@ -{ lib -, aiomisc-pytest -, aiormq -, buildPythonPackage -, docker -, fetchFromGitHub -, pamqp -, poetry-core -, pytestCheckHook -, pythonOlder -, shortuuid -, testcontainers -, wrapt -, yarl +{ + lib, + aiomisc-pytest, + aiormq, + buildPythonPackage, + docker, + fetchFromGitHub, + pamqp, + poetry-core, + pytestCheckHook, + pythonOlder, + shortuuid, + testcontainers, + wrapt, + yarl, }: buildPythonPackage rec { @@ -28,9 +29,7 @@ buildPythonPackage rec { hash = "sha256-aRXYFW4fl3iXH3bwP30+TllRm4BkIUcGMX/lNfhiqjo="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ aiormq @@ -67,9 +66,7 @@ buildPythonPackage rec { "tests/test_types.py" ]; - pythonImportsCheck = [ - "aio_pika" - ]; + pythonImportsCheck = [ "aio_pika" ]; meta = with lib; { description = "AMQP 0.9 client designed for asyncio and humans";