summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2021-01-05 11:05:08 +0100
committerSandro Jäckel <sandro.jaeckel@gmail.com>2021-01-06 11:05:17 +0100
commitb87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f (patch)
tree1b5f6d6eae6adc3f78b8c10c86e6b07d2d6e7236
parenteea72ef8326e8466838a3245fa03d29d619c8a94 (diff)
downloadnixpkgs-b87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f.tar
nixpkgs-b87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f.tar.gz
nixpkgs-b87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f.tar.bz2
nixpkgs-b87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f.tar.lz
nixpkgs-b87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f.tar.xz
nixpkgs-b87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f.tar.zst
nixpkgs-b87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f.zip
pythonPackages.google_cloud_asset: Fix dependencies, cleanup
-rw-r--r--pkgs/development/python-modules/google_cloud_asset/default.nix43
1 files changed, 33 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix
index 87b1fdf8fc9..062d47eb5bd 100644
--- a/pkgs/development/python-modules/google_cloud_asset/default.nix
+++ b/pkgs/development/python-modules/google_cloud_asset/default.nix
@@ -1,6 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, grpc_google_iam_v1
-, google_api_core, google-cloud-access-context-manager, google-cloud-org-policy
-, libcst, proto-plus, pytest, pytest-asyncio, pytestCheckHook, mock }:
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, grpc_google_iam_v1
+, google_api_core
+, google_cloud_access_context_manager
+, google_cloud_org_policy
+, google_cloud_os_config
+, libcst
+, proto-plus
+, pytest
+, pytest-asyncio
+, pytestCheckHook
+, mock
+}:
 
 buildPythonPackage rec {
   pname = "google-cloud-asset";
@@ -8,27 +21,37 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cf1b8a102eea8cec65eb07bef51dc15c1136cfc8564ea7fc5a39465b8f20017";
+    sha256 = "05q0yaw6b553qmzylr45zin17h8mvi8yyyxhbv3cxa7f0ahviw8w";
   };
 
-  disabled = pythonOlder "3.6";
-
-  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
-  disabledTests = [ "asset_service_transport_auth_adc" ];
   propagatedBuildInputs = [
     grpc_google_iam_v1
     google_api_core
-    google-cloud-access-context-manager
-    google-cloud-org-policy
+    google_cloud_access_context_manager
+    google_cloud_org_policy
+    google_cloud_os_config
     libcst
     proto-plus
   ];
 
+  checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+
   # Remove tests intended to be run in VPC
   preCheck = ''
     rm -rf tests/system
   '';
 
+  disabledTests = [ "asset_service_transport_auth_adc" ];
+
+  pythonImportsCheck = [
+    "google.cloud.asset"
+    "google.cloud.asset_v1"
+    "google.cloud.asset_v1p1beta1"
+    "google.cloud.asset_v1p2beta1"
+    "google.cloud.asset_v1p4beta1"
+    "google.cloud.asset_v1p5beta1"
+  ];
+
   meta = with stdenv.lib; {
     description = "Python Client for Google Cloud Asset API";
     homepage = "https://github.com/googleapis/python-asset";