From 14d4d773815af666b2260383bb2913d12694ca89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 20:00:25 +0200 Subject: [PATCH 1/3] python312Packages.aiogram: 3.4.1 -> 3.5.0 Diff: https://github.com/aiogram/aiogram/compare/refs/tags/v3.4.1...v3.5.0 Changelog: https://github.com/aiogram/aiogram/releases/tag/v3.5.0 --- pkgs/development/python-modules/aiogram/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index ed60684b9fa3..b3be6e4e17b9 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.4.1"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-2of4KHdpAATOt0dCqI3AmTJtdeN5SdiWydeGjtagABI="; + hash = "sha256-NOaI01Lb969Lp/v38u2UipN9UbOQNJQEbN2JS3lmFno="; }; nativeBuildInputs = [ @@ -69,6 +69,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-W" "ignore::pluggy.PluggyTeardownRaisedWarning" "-W" "ignore::pytest.PytestDeprecationWarning" + "-W" "ignore::DeprecationWarning" ]; pythonImportsCheck = [ "aiogram" ]; From b2559571414a7c41f883ba0316520950005e47cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 20:01:30 +0200 Subject: [PATCH 2/3] python312Packages.aiogram: refactor --- .../python-modules/aiogram/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index b3be6e4e17b9..04d415ca3d76 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -1,25 +1,25 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pythonRelaxDepsHook -, pytestCheckHook +, aiofiles , aiohttp , aiohttp-socks -, aiofiles , aresponses , babel +, buildPythonPackage , certifi +, fetchFromGitHub +, gitUpdater +, hatchling , magic-filter , pycryptodomex +, pydantic , pytest-aiohttp , pytest-asyncio , pytest-lazy-fixture -, redis -, hatchling -, pydantic +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , pytz -, gitUpdater +, redis }: buildPythonPackage rec { @@ -36,8 +36,11 @@ buildPythonPackage rec { hash = "sha256-NOaI01Lb969Lp/v38u2UipN9UbOQNJQEbN2JS3lmFno="; }; - nativeBuildInputs = [ + build-system = [ hatchling + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; @@ -45,7 +48,7 @@ buildPythonPackage rec { "pydantic" ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp babel From 6387603e093b9ce19c56ab2f0e276faea5f9627b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Apr 2024 20:02:04 +0200 Subject: [PATCH 3/3] python312Packages.aiogram: format with nixfmt --- .../python-modules/aiogram/default.nix | 70 +++++++++---------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 04d415ca3d76..74d9f070a721 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -1,25 +1,26 @@ -{ lib -, aiofiles -, aiohttp -, aiohttp-socks -, aresponses -, babel -, buildPythonPackage -, certifi -, fetchFromGitHub -, gitUpdater -, hatchling -, magic-filter -, pycryptodomex -, pydantic -, pytest-aiohttp -, pytest-asyncio -, pytest-lazy-fixture -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pytz -, redis +{ + lib, + aiofiles, + aiohttp, + aiohttp-socks, + aresponses, + babel, + buildPythonPackage, + certifi, + fetchFromGitHub, + gitUpdater, + hatchling, + magic-filter, + pycryptodomex, + pydantic, + pytest-aiohttp, + pytest-asyncio, + pytest-lazy-fixture, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pytz, + redis, }: buildPythonPackage rec { @@ -36,17 +37,11 @@ buildPythonPackage rec { hash = "sha256-NOaI01Lb969Lp/v38u2UipN9UbOQNJQEbN2JS3lmFno="; }; - build-system = [ - hatchling - ]; + build-system = [ hatchling ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "pydantic" - ]; + pythonRelaxDeps = [ "pydantic" ]; dependencies = [ aiofiles @@ -70,16 +65,17 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "-W" "ignore::pluggy.PluggyTeardownRaisedWarning" - "-W" "ignore::pytest.PytestDeprecationWarning" - "-W" "ignore::DeprecationWarning" + "-W" + "ignore::pluggy.PluggyTeardownRaisedWarning" + "-W" + "ignore::pytest.PytestDeprecationWarning" + "-W" + "ignore::DeprecationWarning" ]; pythonImportsCheck = [ "aiogram" ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { description = "Modern and fully asynchronous framework for Telegram Bot API";