From b077a4f65ac014792be1b81c9c8660bfd04aa49a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 17:17:00 +0200 Subject: [PATCH 1/3] python312Packages.pydiscovergy: 3.0.0 -> 3.0.1 Diff: https://github.com/jpbede/pydiscovergy/compare/refs/tags/v3.0.0...v3.0.1 Changelog: https://github.com/jpbede/pydiscovergy/releases/tag/v3.0.1 --- pkgs/development/python-modules/pydiscovergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index f671ec1e5e60..0c96eb8ddeda 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pydiscovergy"; - version = "3.0.0"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "pydiscovergy"; rev = "refs/tags/v${version}"; - hash = "sha256-ArcH/4ZyOtIGmoXArU+oEd357trJnS9umlN9B+U0dBI="; + hash = "sha256-0zyg1EBPOfcA1jAgtNbDCVaTv9hJQ2Xidl+doHbjKrM="; }; postPatch = '' From 7d959fa092e76650c3eebb5ca4ae637f178fe979 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 17:18:35 +0200 Subject: [PATCH 2/3] python312Packages.pydiscovergy: refactor --- .../python-modules/pydiscovergy/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index 0c96eb8ddeda..f24171224cd7 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -5,6 +5,7 @@ , httpx , mashumaro , orjson +, pytest-asyncio , pytest-httpx , poetry-core , pytestCheckHook @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "pydiscovergy"; version = "3.0.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -32,12 +33,15 @@ buildPythonPackage rec { sed -i '/addopts =/d' pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ authlib httpx mashumaro @@ -46,6 +50,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytest-httpx pytestCheckHook respx @@ -56,7 +61,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Async Python 3 library for interacting with the Discovergy API"; + description = "Library for interacting with the Discovergy API"; homepage = "https://github.com/jpbede/pydiscovergy"; changelog = "https://github.com/jpbede/pydiscovergy/releases/tag/v${version}"; license = licenses.mit; From ccad6d8360eaf102d2ea26b964dd78ca0337b718 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 17:18:50 +0200 Subject: [PATCH 3/3] python312Packages.pydiscovergy: format with nixfmt --- .../python-modules/pydiscovergy/default.nix | 43 ++++++++----------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index f24171224cd7..44f9cfc7c259 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -1,18 +1,19 @@ -{ lib -, authlib -, buildPythonPackage -, fetchFromGitHub -, httpx -, mashumaro -, orjson -, pytest-asyncio -, pytest-httpx -, poetry-core -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pytz -, respx +{ + lib, + authlib, + buildPythonPackage, + fetchFromGitHub, + httpx, + mashumaro, + orjson, + pytest-asyncio, + pytest-httpx, + poetry-core, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pytz, + respx, }: buildPythonPackage rec { @@ -33,13 +34,9 @@ buildPythonPackage rec { sed -i '/addopts =/d' pyproject.toml ''; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ authlib @@ -56,9 +53,7 @@ buildPythonPackage rec { respx ]; - pythonImportsCheck = [ - "pydiscovergy" - ]; + pythonImportsCheck = [ "pydiscovergy" ]; meta = with lib; { description = "Library for interacting with the Discovergy API";