From 462bbfd89e67346476631340211dfbd177dc74cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 21:53:03 +0100 Subject: [PATCH 1/2] python313Packages.proto-plus: 1.24.0 -> 1.25.0 https://github.com/googleapis/proto-plus-python/releases/tag/v1.25.0 --- .../python-modules/proto-plus/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index ae3cd88eeef75..1652041c7da79 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - isPy3k, + fetchFromGitHub, + setuptools, protobuf, googleapis-common-protos, pytestCheckHook, @@ -11,16 +11,19 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.24.0"; - format = "setuptools"; - disabled = !isPy3k; + version = "1.25.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-MLcqXsr+RAaw0znbNbVsQFkGTmkie4w72nRiOX+WZEU="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "proto-plus-python"; + tag = "v${version}"; + hash = "sha256-rRA5t3QPVSeAqy60icrgvYKbvrClv22I3IYxHoMftQ0="; }; - propagatedBuildInputs = [ protobuf ]; + build-system = [ setuptools ]; + + dependencies = [ protobuf ]; nativeCheckInputs = [ pytestCheckHook From cf655a5c29fd467d47ccf37731d02703b97fa1e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 21:54:41 +0100 Subject: [PATCH 2/2] python313Packages.google-api-core: 2.20.0 -> 2.24.0 https://github.com/googleapis/python-api-core/releases/tag/v2.21.0 https://github.com/googleapis/python-api-core/releases/tag/v2.22.0 https://github.com/googleapis/python-api-core/releases/tag/v2.23.0 https://github.com/googleapis/python-api-core/releases/tag/v2.24.0 --- .../python-modules/google-api-core/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index c9cfaeae73fdc..5254ba230cda2 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -19,21 +19,21 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.20.0"; + version = "2.24.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-api-core"; - rev = "v${version}"; - hash = "sha256-ccjkGQNaPRefI6+j/O+NwdBGEVNuZ5q5m1d8EAJGcbs="; + tag = "v${version}"; + hash = "sha256-6U5rNhF4AYWae50pNIqDdlMzRhW4iV9vPlMPXN11DqQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ googleapis-common-protos google-auth protobuf @@ -42,6 +42,7 @@ buildPythonPackage rec { ]; optional-dependencies = { + async_rest = [ google-auth ] ++ google-auth.optional-dependencies.aiohttp; grpc = [ grpcio grpcio-status