From c8fb5fd9e5582ca158df07cc39416cf28f33bd2b Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 21 May 2025 16:14:16 -0700 Subject: [PATCH] python3Packages.google-cloud-datacatalog: refactor Use googleapis/google-cloud-python repo, clean up meta, add maintainer --- .../google-cloud-datacatalog/default.nix | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index c1a0856f772e..463b2b4bf95c 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -1,16 +1,16 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, google-api-core, grpc-google-iam-v1, libcst, mock, + nix-update-script, proto-plus, protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: @@ -19,14 +19,15 @@ buildPythonPackage rec { version = "3.26.1"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "google_cloud_datacatalog"; - inherit version; - hash = "sha256-qKCBos0KyFEZBHSNLmsU3CR3nmXiFht1zH4QdINlokg="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "google-cloud-python"; + tag = "google-cloud-datacatalog-v${version}"; + hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4="; }; + sourceRoot = "${src.name}/packages/google-cloud-datacatalog"; + build-system = [ setuptools ]; dependencies = [ @@ -45,11 +46,18 @@ buildPythonPackage rec { pythonImportsCheck = [ "google.cloud.datacatalog" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "google-cloud-datacatalog-v([0-9.]+)" + ]; + }; + + meta = { description = "Google Cloud Data Catalog API API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-v${version}/packages/google-cloud-datacatalog/CHANGELOG.md"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sarahec ]; }; }