From ee8814c253d4944db80ca0a11ce47812935c4e3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:45:52 +0200 Subject: python312Packages.microsoft-kiota-serialization-multipart: init at 0.1.0 Multipart serialization implementation for Kiota clients in Python https://github.com/microsoft/kiota-serialization-multipart-python --- .../default.nix | 48 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix new file mode 100644 index 0000000000000..543a306d14034 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + microsoft-kiota-serialization-json, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-serialization-multipart"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-serialization-multipart-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-OGX6vX02928F1uCP8bF/q1Z5aDrdj29iQNOITzF2LQI="; + }; + + build-system = [ flit-core ]; + + dependencies = [ microsoft-kiota-abstractions ]; + + nativeCheckInputs = [ + microsoft-kiota-serialization-json + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "kiota_serialization_multipart" ]; + + meta = with lib; { + description = "Multipart serialization implementation for Kiota clients in Python"; + homepage = "https://github.com/microsoft/kiota-serialization-multipart-python"; + changelog = "https://github.com/microsoft/kiota-serialization-multipart-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b5ca7ff75d51..ae67582ef6fc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7317,6 +7317,8 @@ self: super: with self; { microsoft-kiota-serialization-json = callPackage ../development/python-modules/microsoft-kiota-serialization-json { }; + microsoft-kiota-serialization-multipart = callPackage ../development/python-modules/microsoft-kiota-serialization-multipart { }; + microsoft-kiota-serialization-text = callPackage ../development/python-modules/microsoft-kiota-serialization-text { }; midiutil = callPackage ../development/python-modules/midiutil { }; -- cgit 1.4.1 From 7db2c77dbf621e8145e27efce71e8af7cf6a909b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:51:23 +0200 Subject: python312Packages.microsoft-kiota-serialization-form: init at 0.1.0 Form serialization implementation for Kiota clients in Python https://github.com/microsoft/kiota-serialization-form-python --- .../microsoft-kiota-serialization-form/default.nix | 50 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix new file mode 100644 index 0000000000000..652e22d767e82 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + pytest-asyncio, + pendulum, + pytest-mock, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-serialization-form"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-serialization-form-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-ecFspbCaSkRoQTTeyZdqGpWSKiQJS6viDgBVNDHPo4g="; + }; + + build-system = [ flit-core ]; + + dependencies = [ + microsoft-kiota-abstractions + pendulum + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "kiota_serialization_form" ]; + + meta = with lib; { + description = "Form serialization implementation for Kiota clients in Python"; + homepage = "https://github.com/microsoft/kiota-serialization-form-python"; + changelog = "https://github.com/microsoft/kiota-serialization-form-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae67582ef6fc8..d9e55f05693f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7315,6 +7315,8 @@ self: super: with self; { microsoft-kiota-http = callPackage ../development/python-modules/microsoft-kiota-http { }; + microsoft-kiota-serialization-form = callPackage ../development/python-modules/microsoft-kiota-serialization-form { }; + microsoft-kiota-serialization-json = callPackage ../development/python-modules/microsoft-kiota-serialization-json { }; microsoft-kiota-serialization-multipart = callPackage ../development/python-modules/microsoft-kiota-serialization-multipart { }; -- cgit 1.4.1 From b77f47acc2eff7c9ca6e21880a6cd9ca40ec4e07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:56:00 +0200 Subject: python312Packages.microsoft-kiota-abstractions: use nixfmt --- .../microsoft-kiota-abstractions/default.nix | 31 ++++++++++------------ 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index 61b8d7804f51b..a92965db33987 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, opentelemetry-api -, opentelemetry-sdk -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, std-uritemplate +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + opentelemetry-api, + opentelemetry-sdk, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + std-uritemplate, }: buildPythonPackage rec { @@ -25,9 +26,7 @@ buildPythonPackage rec { hash = "sha256-n9Erm21slKm+zDblhSHA5Cwxkyrcyx0w09ua3bUc5XI="; }; - build-system = [ - flit-core - ]; + build-system = [ flit-core ]; dependencies = [ opentelemetry-api @@ -41,9 +40,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "kiota_abstractions" - ]; + pythonImportsCheck = [ "kiota_abstractions" ]; meta = with lib; { description = "Abstractions library for Kiota generated Python clients"; -- cgit 1.4.1 From 9f78b1225bcc64588d7e2ee1136a430cbe6bae76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:57:41 +0200 Subject: python312Packages.microsoft-kiota-authentication-azure: use nixfmt --- .../default.nix | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix index 5526fab6ceaec..aa5568f6b7393 100644 --- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix @@ -1,16 +1,17 @@ -{ lib -, aiohttp -, azure-core -, buildPythonPackage -, fetchFromGitHub -, flit-core -, microsoft-kiota-abstractions -, opentelemetry-api -, opentelemetry-sdk -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder +{ + lib, + aiohttp, + azure-core, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + opentelemetry-api, + opentelemetry-sdk, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -27,9 +28,7 @@ buildPythonPackage rec { hash = "sha256-RA0BbIwDs3cXiH4tQsvCGUO1OAg+DWjEeWd7MEVIC8E="; }; - nativeBuildInputs = [ - flit-core - ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ aiohttp @@ -45,9 +44,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "kiota_authentication_azure" - ]; + pythonImportsCheck = [ "kiota_authentication_azure" ]; meta = with lib; { description = "Kiota Azure authentication provider"; -- cgit 1.4.1 From 525e1949fdbfd4c8ae07d10ef99940f176481498 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:58:17 +0200 Subject: python312Packages.microsoft-kiota-authentication-azure: refactor --- .../python-modules/microsoft-kiota-authentication-azure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix index aa5568f6b7393..ca0670bc5fa7f 100644 --- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix @@ -28,9 +28,9 @@ buildPythonPackage rec { hash = "sha256-RA0BbIwDs3cXiH4tQsvCGUO1OAg+DWjEeWd7MEVIC8E="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp azure-core microsoft-kiota-abstractions -- cgit 1.4.1 From e5b7ca7b56810955bc614396f0c55e7830e84ae6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:59:06 +0200 Subject: python312Packages.microsoft-kiota-http: use nixfmt --- .../microsoft-kiota-http/default.nix | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index a84613b82e3b2..df4e6f48809e6 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, httpx -, microsoft-kiota-abstractions -, opentelemetry-api -, opentelemetry-sdk -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, urllib3 +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + httpx, + microsoft-kiota-abstractions, + opentelemetry-api, + opentelemetry-sdk, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + urllib3, }: buildPythonPackage rec { @@ -27,9 +28,7 @@ buildPythonPackage rec { hash = "sha256-I16WARk6YBr8KgE9MtHcA5VdsnLXBKcZOaqRL/eqwKE="; }; - nativeBuildInputs = [ - flit-core - ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ httpx @@ -45,9 +44,7 @@ buildPythonPackage rec { urllib3 ]; - pythonImportsCheck = [ - "kiota_http" - ]; + pythonImportsCheck = [ "kiota_http" ]; meta = with lib; { description = "HTTP request adapter implementation for Kiota clients for Python"; -- cgit 1.4.1 From 9cc45ca490f8ea4c13331a26596d372470d746c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:59:40 +0200 Subject: python312Packages.microsoft-kiota-http: refactor --- pkgs/development/python-modules/microsoft-kiota-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index df4e6f48809e6..259893de05044 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -28,9 +28,9 @@ buildPythonPackage rec { hash = "sha256-I16WARk6YBr8KgE9MtHcA5VdsnLXBKcZOaqRL/eqwKE="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx microsoft-kiota-abstractions opentelemetry-api -- cgit 1.4.1 From 42540307fd44b824a1556915502e3fe5f187e920 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 23:01:01 +0200 Subject: python312Packages.microsoft-kiota-serialization-json: use nixfmt --- .../microsoft-kiota-serialization-json/default.nix | 31 ++++++++++------------ 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index 21bc6f76feaa1..b5ec598bb7ed5 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, microsoft-kiota-abstractions -, pendulum -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + pendulum, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { - pname = "kiota-serialization-json"; + pname = "microsoft-kiota-serialization-json"; version = "1.1.0"; pyproject = true; @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-igMqwoKArfQ37pzdjUICgXY795dfg/MX65iwTVe0sLM="; }; - nativeBuildInputs = [ - flit-core - ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ microsoft-kiota-abstractions @@ -39,9 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "kiota_serialization_json" - ]; + pythonImportsCheck = [ "kiota_serialization_json" ]; disabledTests = [ # Test compare an output format -- cgit 1.4.1 From 069e4c90e1e29fa059e416f10c7e6e06f26695d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 23:01:43 +0200 Subject: python312Packages.microsoft-kiota-serialization-json: refactor --- .../python-modules/microsoft-kiota-serialization-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index b5ec598bb7ed5..a9bf517e06baa 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -25,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-igMqwoKArfQ37pzdjUICgXY795dfg/MX65iwTVe0sLM="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ microsoft-kiota-abstractions pendulum ]; -- cgit 1.4.1 From 5546ebe068d9ec5bf96cd168dbd0b8ad6a2e36b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 23:02:57 +0200 Subject: python312Packages.microsoft-kiota-serialization-text: use nixfmt --- .../microsoft-kiota-serialization-text/default.nix | 31 ++++++++++------------ 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index 64e00d4778757..fb15b8ac1d6f3 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, microsoft-kiota-abstractions -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, python-dateutil -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + python-dateutil, + pythonOlder, }: buildPythonPackage rec { - pname = "kiota-serialization-text"; + pname = "microsoft-kiota-serialization-text"; version = "1.0.0"; pyproject = true; @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-jPuRfvqO4n5/PjSOS5NMCawaYRhXmrZtfg6LgYFCv7o="; }; - nativeBuildInputs = [ - flit-core - ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ microsoft-kiota-abstractions @@ -39,9 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "kiota_serialization_text" - ]; + pythonImportsCheck = [ "kiota_serialization_text" ]; meta = with lib; { description = "Text serialization implementation for Kiota generated clients in Python"; -- cgit 1.4.1 From 86bcda9f4faaddb98e8e7ef959552014f7171584 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 23:03:43 +0200 Subject: python312Packages.microsoft-kiota-serialization-text: refactor --- .../python-modules/microsoft-kiota-serialization-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index fb15b8ac1d6f3..8c7e2d79ea64d 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -25,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-jPuRfvqO4n5/PjSOS5NMCawaYRhXmrZtfg6LgYFCv7o="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ microsoft-kiota-abstractions python-dateutil ]; -- cgit 1.4.1 From 5c48456575e140ebfe4f8733ac6b4508f17cea14 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 23:09:35 +0200 Subject: python312Packages.msgraph-sdk: 1.1.0 -> 1.2.0 Changelog: https://github.com/microsoftgraph/msgraph-sdk-python/releases/tag/v1.2.0 --- pkgs/development/python-modules/msgraph-sdk/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 51027a2897bfb..7dc4e3fd062f2 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -6,7 +6,9 @@ microsoft-kiota-abstractions, microsoft-kiota-authentication-azure, microsoft-kiota-http, + microsoft-kiota-serialization-form, microsoft-kiota-serialization-json, + microsoft-kiota-serialization-multipart, microsoft-kiota-serialization-text, msgraph-core, pythonOlder, @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-fAchReqVhkVhT48UrTnBUQerHmgB7qxpey0xrgxIVDs="; + hash = "sha256-UaGdusPGWlF7gTzpCq9WrF/evdDSK5srrkH8/Vz9O8M="; }; build-system = [ setuptools ]; @@ -34,7 +36,9 @@ buildPythonPackage rec { microsoft-kiota-abstractions microsoft-kiota-authentication-azure microsoft-kiota-http + microsoft-kiota-serialization-form microsoft-kiota-serialization-json + microsoft-kiota-serialization-multipart microsoft-kiota-serialization-text msgraph-core ]; -- cgit 1.4.1