From d0bef3cb6b58d0e5fbe886c7070016c09f451a88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:36:50 +0200 Subject: [PATCH 1/2] python312Packages.pyairnow: 1.2.1 -> 1.2.2 Diff: https://github.com/asymworks/pyairnow/compare/refs/tags/v1.2.1...v1.2.2 Changelog: https://github.com/asymworks/pyairnow/blob/v1.2.2/CHANGELOG.md --- .../python-modules/pyairnow/default.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index e3d93e1cfb12..667869f48a17 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -4,39 +4,31 @@ aioresponses, buildPythonPackage, fetchFromGitHub, - fetchpatch, - pytest-aiohttp, poetry-core, + pytest-aiohttp, pytest-asyncio, pytest-cov, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "pyairnow"; - version = "1.2.1"; - format = "pyproject"; + version = "1.2.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asymworks"; - repo = pname; + repo = "pyairnow"; rev = "refs/tags/v${version}"; - hash = "sha256-aab+3xrEiCjysa+DzXWelQwz8V2tr74y8v0NpDZiuTk="; + hash = "sha256-KjOu9V92n2rq8iOkgutlK7EMRvirFAEK8oxseI+dr2s="; }; - patches = [ - (fetchpatch { - # remove setuptools, wheel from build-system requirements - # https://github.com/asymworks/pyairnow/pull/7 - name = "pyairnow-build-system.patch"; - url = "https://github.com/asymworks/pyairnow/commit/e3cc892ffce855d8213264248b6b4ed78ee791bd.patch"; - hash = "sha256-L0MV2okkf6Nf1S4zS7lb4lt5eSfTF10yDJLzpyDrSl8="; - }) - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ aioresponses @@ -52,7 +44,7 @@ buildPythonPackage rec { description = "Python wrapper for EPA AirNow Air Quality API"; homepage = "https://github.com/asymworks/pyairnow"; changelog = "https://github.com/asymworks/pyairnow/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From fd8508a4a8454598f8247393439c0a95d73ad119 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Aug 2024 22:38:13 +0200 Subject: [PATCH 2/2] python312Packages.pyairnow: migrate to pytest-cov-stub --- pkgs/development/python-modules/pyairnow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index 667869f48a17..5a59c39d62b2 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -7,7 +7,7 @@ poetry-core, pytest-aiohttp, pytest-asyncio, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -34,7 +34,7 @@ buildPythonPackage rec { aioresponses pytest-asyncio pytest-aiohttp - pytest-cov + pytest-cov-stub pytestCheckHook ];