From 37a839d6f6432df3edf909f482b44b3bd3f7738a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 01:00:05 +0200 Subject: [PATCH 1/5] python310Packages.logging-journald: init at 0.6.1 --- .../logging-journald/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/logging-journald/default.nix diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix new file mode 100644 index 000000000000..0ceee6218d15 --- /dev/null +++ b/pkgs/development/python-modules/logging-journald/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "logging-journald"; + version = "0.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-lR2bRtw9kUY/22ij5Ge79nY4hzEq9zRl+GhFPZHW/0E="; + }; + + # Circular dependency with aiomisc + doCheck = false; + + pythonImportsCheck = [ + "logging_journald" + ]; + + meta = with lib; { + description = "Logging handler for writing logs to the journald"; + homepage = "https://github.com/mosquito/logging-journald"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9283376236d..5e37154f2217 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5369,6 +5369,8 @@ in { logfury = callPackage ../development/python-modules/logfury { }; + logging-journald = callPackage ../development/python-modules/logging-journald { }; + logi-circle = callPackage ../development/python-modules/logi-circle { }; logical-unification = callPackage ../development/python-modules/logical-unification { }; From 1ed0f23ecbe44f2b3f2d0f00e5313fc0287e29f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 01:02:43 +0200 Subject: [PATCH 2/5] python310Packages.logging-journald: 0.6.1 -> 0.6.2 --- .../python-modules/logging-journald/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix index 0ceee6218d15..6abd9efeda27 100644 --- a/pkgs/development/python-modules/logging-journald/default.nix +++ b/pkgs/development/python-modules/logging-journald/default.nix @@ -1,21 +1,19 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "logging-journald"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "mosquito"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-lR2bRtw9kUY/22ij5Ge79nY4hzEq9zRl+GhFPZHW/0E="; + src = fetchPypi { + inherit pname version; + hash = "sha256-U6kqAvMSyLDbThc6wAN/ri0vmt/vAxgFFZT65Csbpss="; }; # Circular dependency with aiomisc From 4dae2933ba146d447b9178920e7c9a5b33103664 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 01:13:53 +0200 Subject: [PATCH 3/5] python310Packages.aiomisc: init at 16.2 --- .../python-modules/aiomisc/default.nix | 88 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/development/python-modules/aiomisc/default.nix diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix new file mode 100644 index 000000000000..d1fd33eb618e --- /dev/null +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -0,0 +1,88 @@ +{ lib +, aiocontextvars + #, aiocarbon +, aiohttp + #, aiohttp-asgi +, async-timeout +, buildPythonPackage +, colorlog +, croniter +, fastapi +, fetchFromGitHub +, logging-journald +, pytestCheckHook +, pythonOlder +, raven + #, raven-aiohttp +, setproctitle +, uvloop +}: + +buildPythonPackage rec { + pname = "aiomisc"; + version = "16.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aiokitchen"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-wxm7MrFHZ7TrUGw5w7iLWs1olU8ZmJmJ7M/BZ6Nf0fU="; + }; + + propagatedBuildInputs = [ + colorlog + logging-journald + ]; + + checkInputs = [ + aiocontextvars + async-timeout + fastapi + pytestCheckHook + raven + setproctitle + ] ++ passthru.optional-dependencies.aiohttp + ++ passthru.optional-dependencies.cron + ++ passthru.optional-dependencies.uvloop; + + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + #asgi = [ + # aiohttp-asgi + #]; + cron = [ + croniter + ]; + #carbon = [ + # aiocarbon + #]; + #raven = [ + # raven-aiohttp + #]; + uvloop = [ + uvloop + ]; + }; + + pythonImportsCheck = [ + "aiomisc" + ]; + + disabledTestPaths = [ + # Dependencies are not available at the moment + "tests/test_entrypoint.py" + "tests/test_raven_service.py" + ]; + + meta = with lib; { + description = "Miscellaneous utils for asyncio"; + 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 5e37154f2217..c569daddacbd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -374,6 +374,8 @@ in { aiolyric = callPackage ../development/python-modules/aiolyric { }; + aiomisc = callPackage ../development/python-modules/aiomisc { }; + aiomodernforms = callPackage ../development/python-modules/aiomodernforms { }; aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; From 9cb10063fb466fb68db279457d9ee8752ab1eb2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 01:16:08 +0200 Subject: [PATCH 4/5] python310Packages.caio: init at 0.9.8 --- .../python-modules/caio/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/caio/default.nix diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix new file mode 100644 index 000000000000..28ba5a2f4d19 --- /dev/null +++ b/pkgs/development/python-modules/caio/default.nix @@ -0,0 +1,38 @@ +{ lib +, aiomisc +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "caio"; + version = "0.9.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-hUG5EaraoKj3D3K+Qm2Nm1AFe19qwRy/FnEb1SXWKDM="; + }; + + checkInputs = [ + aiomisc + pytestCheckHook + ]; + + pythonImportsCheck = [ + "caio" + ]; + + meta = with lib; { + description = "File operations with asyncio support"; + homepage = "https://github.com/mosquito/caio"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c569daddacbd..79538788d8fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1601,6 +1601,8 @@ in { inherit (self) python numpy boost; }); + caio = callPackage ../development/python-modules/caio { }; + cairo-lang = callPackage ../development/python-modules/cairo-lang { }; cairocffi = callPackage ../development/python-modules/cairocffi { }; From ab89aac13ed6b4814b166107da25426449f559d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 01:19:44 +0200 Subject: [PATCH 5/5] python310Packages.aiofile: init at 3.8.0 --- .../python-modules/aiofile/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/aiofile/default.nix diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix new file mode 100644 index 000000000000..ec09473e2072 --- /dev/null +++ b/pkgs/development/python-modules/aiofile/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiomisc +, asynctest +, caio +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiofile"; + version = "3.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mosquito"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w="; + }; + + propagatedBuildInputs = [ + caio + ]; + + checkInputs = [ + aiomisc + asynctest + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiofile" + ]; + + meta = with lib; { + description = "File operations with asyncio support"; + homepage = "https://github.com/mosquito/aiofile"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79538788d8fc..2ab09113109b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -306,6 +306,8 @@ in { aioextensions = callPackage ../development/python-modules/aioextensions { }; + aiofile = callPackage ../development/python-modules/aiofile { }; + aiofiles = callPackage ../development/python-modules/aiofiles { }; aioflo = callPackage ../development/python-modules/aioflo { };