From 8a339bb874ef98fec364e5362e8d055b999dd1d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 21:02:34 +0200 Subject: [PATCH 1/7] python310Packages.aiomisc: 16.3.15 -> 17.0.8 --- pkgs/development/python-modules/aiomisc/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index ce000ddb0361..662051fcf5db 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -10,29 +10,36 @@ , fastapi , fetchPypi , logging-journald +, poetry-core , pytestCheckHook , pythonOlder , raven #, raven-aiohttp , setproctitle +, setuptools , uvloop }: buildPythonPackage rec { pname = "aiomisc"; - version = "16.3.15"; - format = "setuptools"; + version = "17.0.8"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lHDjsK8ds1ftovY2IAbJwk3jnn4FoDo6f/Nu/MSAhqM="; + hash = "sha256-URN9ACnHbQnq7UqfKwhofOdpE/Bjz7WrbdWQikxpVOU="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ colorlog logging-journald + setuptools ]; nativeCheckInputs = [ From d4bb2b1f4f93665d783eff5ad0a8c42a6baae495 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 21:05:27 +0200 Subject: [PATCH 2/7] python310Packages.aiomisc: add changelog to meta --- pkgs/development/python-modules/aiomisc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 662051fcf5db..de571b3bccd1 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -90,6 +90,7 @@ buildPythonPackage rec { meta = with lib; { description = "Miscellaneous utils for asyncio"; homepage = "https://github.com/aiokitchen/aiomisc"; + changelog = "https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 7206f1d01f25afa34e4e2963c3bf3f6cecc34638 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 21:27:43 +0200 Subject: [PATCH 3/7] python310Packages.aiomisc-pytest: init at 1.1.1 --- .../python-modules/aiomisc-pytest/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/aiomisc-pytest/default.nix diff --git a/pkgs/development/python-modules/aiomisc-pytest/default.nix b/pkgs/development/python-modules/aiomisc-pytest/default.nix new file mode 100644 index 000000000000..c3f720cdadeb --- /dev/null +++ b/pkgs/development/python-modules/aiomisc-pytest/default.nix @@ -0,0 +1,48 @@ +{ lib +, aiomisc +, buildPythonPackage +, fetchPypi +, poetry-core +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiomisc-pytest"; + version = "1.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "aiomisc_pytest"; + inherit version; + hash = "sha256-LDeMQbB4wFdgJ95r9/vFN6fmkoXSPq9NRXONXQ3lbdM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + aiomisc + ]; + + pythonImportsCheck = [ + "aiomisc_pytest" + ]; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Pytest integration for aiomisc"; + homepage = "https://github.com/aiokitchen/aiomisc"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 267dc6f25fc6..f10366b69f0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -258,6 +258,8 @@ self: super: with self; { aiomisc = callPackage ../development/python-modules/aiomisc { }; + aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { }; + aiomodernforms = callPackage ../development/python-modules/aiomodernforms { }; aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; From 2f29aa5f4ad2859a720cd4bd34a89507301a3ecb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 21:42:14 +0200 Subject: [PATCH 4/7] python310Packages.caio: add missing input --- pkgs/development/python-modules/caio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index 0e1bf5b4c2f4..b34bebb57e82 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -2,6 +2,7 @@ , aiomisc , buildPythonPackage , fetchFromGitHub +, pytest-aiohttp , pytestCheckHook , pythonOlder }: @@ -22,6 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aiomisc + pytest-aiohttp pytestCheckHook ]; From 61913091143cb304b3ea2e6cd67ec60488e7d4d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 21:42:53 +0200 Subject: [PATCH 5/7] python310Packages.aiofile: 3.8.0 -> 3.8.5 Diff: https://github.com/mosquito/aiofile/compare/refs/tags/3.8.0...3.8.5 Changelog: https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md --- .../python-modules/aiofile/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix index 5d79aaa1bc32..27e7cc812607 100644 --- a/pkgs/development/python-modules/aiofile/default.nix +++ b/pkgs/development/python-modules/aiofile/default.nix @@ -1,16 +1,16 @@ { lib , aiomisc +, aiomisc-pytest , caio , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aiofile"; - version = "3.8.0"; + version = "3.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,23 +19,16 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w="; + hash = "sha256-jQ97jtYhkqQgQjtHhtlk5JlvkzbFQw3kY6uXuV81ZkQ="; }; - patches = [ - (fetchpatch { - name = "remove-asynctest.patch"; - url = "https://github.com/mosquito/aiofile/commit/9253ca42022f17f630ccfb6811f67876910f8b13.patch"; - hash = "sha256-yMRfqEbdxApFypEj27v1zTgF/4kuLf5aS/+clo3mfZo="; - }) - ]; - propagatedBuildInputs = [ caio ]; nativeCheckInputs = [ aiomisc + aiomisc-pytest pytestCheckHook ]; @@ -63,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "File operations with asyncio support"; homepage = "https://github.com/mosquito/aiofile"; + changelog = "https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 4b458656f974cdafcde10083319a0cc4083214b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 22:07:31 +0200 Subject: [PATCH 6/7] python310Packages.aiormq: 6.7.2 -> 6.7.4 Changelog: https://github.com/mosquito/aiormq/releases/tag/6.7.4 --- pkgs/development/python-modules/aiormq/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index b8ec9619b139..d50261c82dea 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -1,4 +1,5 @@ { lib +, aiomisc-pytest , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "aiormq"; - version = "6.7.2"; + version = "6.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ujRw+trXOZaCRsZdkE3WoomOSdYoQkHmtlyFg1mp3Sg="; + hash = "sha256-vORo5Kqy+Rg8WCyFU5lyQHS4EALYkycY4XxYhABV/4A="; }; nativeBuildInputs = [ @@ -39,7 +40,7 @@ buildPythonPackage rec { ]; checkInputs = [ - aiomisc + aiomisc-pytest ]; # Tests attempt to connect to a RabbitMQ server From eda3223b431794755566dbe160f4afeef25fc1b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 22:27:13 +0200 Subject: [PATCH 7/7] python310Packages.aio-pika: adjust inputs --- pkgs/development/python-modules/aio-pika/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 5e89c35a8c56..90b8c171fe1c 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -1,8 +1,9 @@ { lib -, aiomisc +, aiomisc-pytest , aiormq , buildPythonPackage , fetchFromGitHub +, pamqp , poetry-core , pytestCheckHook , pythonOlder @@ -39,11 +40,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aiomisc-pytest + pamqp pytestCheckHook - ]; - - checkInputs = [ - aiomisc shortuuid ];