From 8438ebc4eddbcf89bbda45f6a9b7000e5d2e6a87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:28:45 +0200 Subject: [PATCH 1/3] python311Packages.msgraph-core: 1.0.0 -> 1.1.0 Diff: https://github.com/microsoftgraph/msgraph-sdk-python-core/compare/refs/tags/v1.0.0...v1.1.0 --- .../python-modules/msgraph-core/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index f8ee81afbac2..19779e82180c 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, python-dotenv , pythonOlder , fetchFromGitHub , setuptools @@ -15,17 +16,17 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-VizjN7sXqPvo9VOSaaUnogTlUDJ1OA2COYNTcVRqhJA="; + hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ azure-identity pytestCheckHook + python-dotenv responses ]; @@ -51,6 +53,11 @@ buildPythonPackage rec { "msgraph_core" ]; + disabledTestPaths = [ + # client_id should be the id of a Microsoft Entra application + "tests/tasks/test_page_iterator.py" + ]; + meta = { description = "Core component of the Microsoft Graph Python SDK"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; From 2cbd830c439435665c73af6da3d0c45bb8cd949c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:30:34 +0200 Subject: [PATCH 2/3] python312Packages.msgraph-core: refactor --- pkgs/development/python-modules/msgraph-core/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 19779e82180c..ee01fdc1e7c7 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ httpx microsoft-kiota-abstractions microsoft-kiota-authentication-azure @@ -61,6 +61,7 @@ buildPythonPackage rec { meta = { description = "Core component of the Microsoft Graph Python SDK"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; + changelog = "https://github.com/microsoftgraph/msgraph-sdk-python-core/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; From 61acf32683b20077a110712bc5732e94be836877 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 21:31:01 +0200 Subject: [PATCH 3/3] python312Packages.msgraph-core: format with nixfmt --- .../python-modules/msgraph-core/default.nix | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index ee01fdc1e7c7..8bc1b7489301 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, python-dotenv -, pythonOlder -, fetchFromGitHub -, setuptools -, httpx -, microsoft-kiota-abstractions -, microsoft-kiota-authentication-azure - ,microsoft-kiota-http -, requests -, azure-identity -, pytestCheckHook -, responses +{ + lib, + buildPythonPackage, + python-dotenv, + pythonOlder, + fetchFromGitHub, + setuptools, + httpx, + microsoft-kiota-abstractions, + microsoft-kiota-authentication-azure, + microsoft-kiota-http, + requests, + azure-identity, + pytestCheckHook, + responses, }: buildPythonPackage rec { @@ -21,7 +22,6 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; @@ -29,9 +29,7 @@ buildPythonPackage rec { hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ httpx @@ -39,7 +37,6 @@ buildPythonPackage rec { microsoft-kiota-authentication-azure microsoft-kiota-http requests - ]; nativeCheckInputs = [ @@ -49,9 +46,7 @@ buildPythonPackage rec { responses ]; - pythonImportsCheck = [ - "msgraph_core" - ]; + pythonImportsCheck = [ "msgraph_core" ]; disabledTestPaths = [ # client_id should be the id of a Microsoft Entra application