From 1bc7ebce11f32aafbe1623b0b8a8a6b009630767 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 12 Oct 2020 20:55:42 -0700 Subject: [PATCH 1/4] python3Packages.google-cloud-access-context-manager: init at 0.1.2 (cherry picked from commit 906d77af8b314d15dd14a73c83479568f4fed37b) --- .../default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-access-context-manager/default.nix diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix new file mode 100644 index 00000000000000..01f7bc9ce33e5c --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }: + +buildPythonPackage rec { + pname = "google-cloud-access-context-manager"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = [ google_api_core ]; + + # No tests in repo + doCheck = false; + + pythonImportsCheck = [ "google.identity.accesscontextmanager" ]; + + meta = with lib; { + description = "Protobufs for Google Access Context Manager."; + homepage = "https://github.com/googleapis/python-access-context-manager"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58e5fb5e6fc0c1..c3a84d3dde0051 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2390,6 +2390,8 @@ in { google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + google-cloud-access-context-manager = callPackage ../development/python-modules/google-cloud-access-context-manager { }; + google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; From 949ab38d5a84d82c5fdac11c47479e6093a51700 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 12 Oct 2020 20:56:31 -0700 Subject: [PATCH 2/4] python3Packages.google-cloud-org-policy: init at 0.1.2 (cherry picked from commit c9c4730f1118c50649a505ac23f4732ff321be50) --- .../google-cloud-org-policy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-org-policy/default.nix diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix new file mode 100644 index 00000000000000..39cc0dc9c24b85 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }: + +buildPythonPackage rec { + pname = "google-cloud-org-policy"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh"; + }; + + disabled = pythonOlder "3.5"; + + propagatedBuildInputs = [ google_api_core ]; + + # No tests in repo + doCheck = false; + + pythonImportsCheck = [ "google.cloud.orgpolicy" ]; + + meta = with lib; { + description = "Protobufs for Google Cloud Organization Policy."; + homepage = "https://github.com/googleapis/python-org-policy"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c3a84d3dde0051..14968639f27e67 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2428,6 +2428,8 @@ in { google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { }; + google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { }; + google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { }; From 954377bf6bc994c18d43b3c891e2538cc00cdc60 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 12 Oct 2020 20:59:45 -0700 Subject: [PATCH 3/4] python3Packages.libcst: 0.3.12 -> 0.3.13 (cherry picked from commit 80b03e4045ae3cf3c438d4eb3758424f44050b96) --- .../python-modules/libcst/default.nix | 55 +++++++++++-------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 5f4fec2612a031..e0ea0e332af678 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -1,36 +1,43 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, typing-inspect -, pyyaml -, isPy3k -}: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, black, isort +, pytestCheckHook, pyyaml, typing-extensions, typing-inspect }: buildPythonPackage rec { pname = "libcst"; - version = "0.3.12"; + version = "0.3.13"; - src = fetchPypi { - inherit pname version; - sha256 = "1zgwxdbhz2ljl0yzbrn1f4f464rjphx0j6r4qq0csax3m4wp50x1"; + # Some files for tests missing from PyPi + # https://github.com/Instagram/LibCST/issues/331 + src = fetchFromGitHub { + owner = "instagram"; + repo = pname; + rev = "v${version}"; + sha256 = "0pbddjrsqj641mr6zijk2phfn15dampbx268zcws4bhhhnrxlj65"; }; - # The library uses type annotation syntax. - disabled = !isPy3k; + disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ typing-inspect pyyaml ]; + propagatedBuildInputs = [ pyyaml typing-inspect ]; + + checkInputs = [ black isort pytestCheckHook ]; + + # https://github.com/Instagram/LibCST/issues/346 + # https://github.com/Instagram/LibCST/issues/347 + preCheck = '' + python -m libcst.codegen.generate visitors + python -m libcst.codegen.generate return_types + rm libcst/tests/test_fuzz.py + rm libcst/tests/test_pyre_integration.py + rm libcst/metadata/tests/test_full_repo_manager.py + rm libcst/metadata/tests/test_type_inference_provider.py + ''; - # Test fails with ValueError: No data_provider tests were created for - # test_type_availability! Please double check your data. - # The tests appear to be doing some dynamic introspection, not sure what is - # going on there. - doCheck = false; pythonImportsCheck = [ "libcst" ]; - meta = with stdenv.lib; { - description = "A concrete syntax tree parser and serializer library for Python that preserves many aspects of Python's abstract syntax tree"; - homepage = "https://libcst.readthedocs.io/en/latest/"; - license = with licenses; [mit asl20 psfl]; - maintainers = [ maintainers.ruuda ]; + meta = with lib; { + description = + "A Concrete Syntax Tree (CST) parser and serializer library for Python."; + homepage = "https://github.com/Instagram/libcst"; + license = with licenses; [ mit asl20 psfl ]; + maintainers = with maintainers; [ maintainers.ruuda ]; }; } From cbe1349fa71bc6e0964604ad635b9cf974b9031a Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 12 Oct 2020 21:02:29 -0700 Subject: [PATCH 4/4] python3Packages.google_cloud_asset: fix build, 2.0.0 -> 2.1.0 (cherry picked from commit 326a5f7132de5f6c90c266b8d1b5892559407a22) --- .../google_cloud_asset/default.nix | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index 927ad94e78f144..b1366c0d35cf19 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -1,32 +1,37 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock -}: +{ 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 }: buildPythonPackage rec { pname = "google-cloud-asset"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "fd4c0f7f61a8a1c5907cd6cc27a028b16236bf3d982ff412df0d2c981cef5ae5"; + sha256 = "14r77bcxy7bmqhmz2hzcf3km2y4vivf5sfzgqjwlyynaydhn4f6j"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + disabled = pythonOlder "3.6"; - checkPhase = '' - pytest tests/unit + 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 + libcst + proto-plus + ]; + + # Remove tests intended to be run in VPC + preCheck = '' + rm -rf tests/system ''; meta = with stdenv.lib; { - description = "Cloud Asset API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + description = "Python Client for Google Cloud Asset API"; + homepage = "https://github.com/googleapis/python-asset"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; };