From fd0f019629366b30403e5da84add2f6ab40e827d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jan 2021 13:55:48 +0100 Subject: [PATCH 01/69] gpsbabel: Fix tests --- pkgs/applications/misc/gpsbabel/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 6b8cb66c78b7..a95ffbbb59aa 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, qtbase, zlib, IOKit, which }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, qtbase, zlib, IOKit, which, expat }: stdenv.mkDerivation rec { pname = "gpsbabel"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 qtbase zlib ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; - checkInputs = [ which ]; # Avoid ./testo.d/kml.test: line 74: which: command not found. Skipping KML validation phase. + checkInputs = [ expat.dev which ]; # Avoid ./testo.d/kml.test: line 74: which: command not found. Skipping KML validation phase. /* FIXME: Building the documentation, with "make doc", requires this: @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { patchShebangs testo substituteInPlace testo \ --replace "-x /usr/bin/hexdump" "" + + rm -v testo.d/alantrl.test '' # The raymarine and gtm tests fail on i686 despite -ffloat-store. + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" From 90760ccb9eba0f4390521e9f1fdba26a89cc8da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jan 2021 13:56:13 +0100 Subject: [PATCH 02/69] pythonPackages.liquidctl: Disable tests --- pkgs/development/python-modules/liquidctl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 888f09dba95b..5311c581317b 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -27,6 +27,10 @@ buildPythonPackage rec { smbus-cffi ]; + # does not contain tests + disableCheck = false; + pythonImportsCheck = [ "liquidctl" ]; + meta = with lib; { description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; homepage = "https://github.com/liquidctl/liquidctl"; From 7452b3d85335014ff1ad7b5246de0ecbfb392973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jan 2021 13:56:38 +0100 Subject: [PATCH 03/69] pythonPackages.nitime: Use pytestCheckHook --- pkgs/development/python-modules/nitime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index 8fa40465c10d..68eeab46afc4 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , python , fetchPypi -, pytest +, pytestCheckHook , cython , numpy , scipy @@ -21,11 +21,11 @@ buildPythonPackage rec { sha256 = "0hb3x5196z2zaawb8s7lhja0vd3n983ncaynqfl9qg315x9ax7i6"; }; - checkInputs = [ pytest ]; buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; - checkPhase = "pytest nitime/tests"; + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://nipy.org/nitime"; From 65eccfad5d32328d12cf8b42d02560905a8c9bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jan 2021 14:58:10 +0100 Subject: [PATCH 04/69] pythonPackages.lmdb: Fix build --- pkgs/development/python-modules/lmdb/default.nix | 16 ++++++++++------ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 76cd2acd7435..3dc2fec4b744 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -1,8 +1,10 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , cffi +, lmdb +, ludios_wpull }: buildPythonPackage rec { @@ -14,10 +16,13 @@ buildPythonPackage rec { sha256 = "4136ffdf0aad61da86d1402808029d002a771b2a9ccc9b39c6bcafa7847c21b6"; }; - checkInputs = [ pytest cffi ]; - checkPhase = '' - py.test - ''; + buildInputs = [ lmdb ]; + + propogatedBuildInputs = [ ludios_wpull ]; + + checkInputs = [ cffi pytestCheckHook ]; + + LMDB_FORCE_SYSTEM=1; meta = with stdenv.lib; { description = "Universal Python binding for the LMDB 'Lightning' Database"; @@ -25,5 +30,4 @@ buildPythonPackage rec { license = licenses.openldap; maintainers = with maintainers; [ copumpkin ivan ]; }; - } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d79240a46aaf..71fc72bbd5a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3634,7 +3634,9 @@ in { llvm = pkgs.llvm_9; }; # llvmlite always requires a specific version of llvm. - lmdb = callPackage ../development/python-modules/lmdb { }; + lmdb = callPackage ../development/python-modules/lmdb { + inherit (pkgs) lmdb; + }; lml = callPackage ../development/python-modules/lml { }; From ffced65ceefb1a863db7f870d955ca7936c093d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jan 2021 14:59:03 +0100 Subject: [PATCH 05/69] grab-site: Fix package --- pkgs/tools/backup/grab-site/default.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index e69823ab45d6..7ef1f110b696 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,5 +1,4 @@ { stdenv, python37, fetchFromGitHub }: - let python = python37.override { self = python; @@ -8,19 +7,32 @@ let }; }; -in with python.pkgs; buildPythonApplication rec { - version = "2.1.19"; - name = "grab-site-${version}"; +in +with python.pkgs; buildPythonApplication rec { + pname = "grab-site"; + version = "2.2.0"; src = fetchFromGitHub { rev = version; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; + sha256 = "1jxcv9dral6h7vfpfqkp1yif6plj0vspzakymkj8hfl75nh0wpv8"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-3.0.7"' '"wpull"' + ''; + propagatedBuildInputs = [ - click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet + click + ludios_wpull + manhole + lmdb + autobahn + fb-re2 + websockets + cchardet ]; checkPhase = '' From 11aa63cd952757b6b52c393ca045d0c0c81b5f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jan 2021 17:13:25 +0100 Subject: [PATCH 06/69] top-level: cleanups --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0c6266c4b9..5156c64a764b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7867,7 +7867,7 @@ in tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; + tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; tinycbor = callPackage ../development/libraries/tinycbor { }; @@ -7875,13 +7875,13 @@ in tinyemu = callPackage ../applications/virtualization/tinyemu { }; - tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {}; + tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; tinyprog = callPackage ../development/tools/misc/tinyprog { }; - tinyproxy = callPackage ../tools/networking/tinyproxy {}; + tinyproxy = callPackage ../tools/networking/tinyproxy { }; tio = callPackage ../tools/misc/tio { }; From f34f2f0b904cf3ad84a1f1b1f1352d0b850e2626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jan 2021 17:41:32 +0100 Subject: [PATCH 07/69] treewide: inherit format = "wheel" --- .../python-modules/marionette-harness/mozdevice.nix | 3 +-- pkgs/development/python-modules/poster3/default.nix | 3 +-- .../python-modules/tensorflow-tensorboard/1/default.nix | 3 +-- .../python-modules/tensorflow-tensorboard/2/default.nix | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 03187c00bef9..56c8fc5254d2 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -12,9 +12,8 @@ buildPythonPackage rec { format = "wheel"; src = fetchPypi { - inherit pname version; + inherit pname version format; sha256 = "1n7l3drdh3rm3320v98c9hhh37ljk9l861hyw18psca7jdd717n5"; - format = "wheel"; }; propagatedBuildInputs = [ mozlog moznetwork mozprocess ]; diff --git a/pkgs/development/python-modules/poster3/default.nix b/pkgs/development/python-modules/poster3/default.nix index 269995717aa4..09e8055bdd91 100644 --- a/pkgs/development/python-modules/poster3/default.nix +++ b/pkgs/development/python-modules/poster3/default.nix @@ -15,8 +15,7 @@ buildPythonPackage rec { disabled = !isPy3k; src = fetchPypi { - inherit pname version; - format = "wheel"; + inherit pname version format; python = "py3"; sha256 = "1b27d7d63e3191e5d7238631fc828e4493590e94dcea034e386c079d853cce14"; }; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix index 6cc3636b7f30..f58b1a207719 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix @@ -20,8 +20,7 @@ buildPythonPackage rec { src = fetchPypi ({ pname = "tensorboard"; - inherit version; - format = "wheel"; + inherit version format; } // (if isPy3k then { python = "py3"; sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix index 945896dda018..d0cf7f28f4d6 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix @@ -21,8 +21,7 @@ buildPythonPackage rec { src = fetchPypi ({ pname = "tensorboard"; - inherit version; - format = "wheel"; + inherit version format; } // (if isPy3k then { python = "py3"; sha256 = "1wpjdzhjpcdkyaahzd4bl71k4l30z5c55280ndiwj32hw70lxrp6"; From 9711439698f4be3ec4cf03cc93e2aa577285d7d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 10:48:22 +0100 Subject: [PATCH 08/69] pythonPackages.google_cloud_access_context_manager: Rename to fit other packages, cleanup --- .../default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/{google-cloud-access-context-manager => google_cloud_access_context_manager}/default.nix (79%) 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 similarity index 79% rename from pkgs/development/python-modules/google-cloud-access-context-manager/default.nix rename to pkgs/development/python-modules/google_cloud_access_context_manager/default.nix index 01f7bc9ce33e..82ba8a7fdcb4 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_access_context_manager/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; }; - disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ google_api_core ]; # No tests in repo doCheck = false; - pythonImportsCheck = [ "google.identity.accesscontextmanager" ]; + 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 ]; + maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71fc72bbd5a9..fe0a1555036d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2525,7 +2525,7 @@ 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_access_context_manager = callPackage ../development/python-modules/google_cloud_access_context_manager { }; google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; From cb58e7539f5dc1579e323b814feb679f677e68e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 10:52:31 +0100 Subject: [PATCH 09/69] pythonPackages.google_cloud_iam: Rename to fit other packages, cleanup --- .../default.nix | 23 +++++++++++++++---- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) rename pkgs/development/python-modules/{google-cloud-iam => google_cloud_iam}/default.nix (53%) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google_cloud_iam/default.nix similarity index 53% rename from pkgs/development/python-modules/google-cloud-iam/default.nix rename to pkgs/development/python-modules/google_cloud_iam/default.nix index 9d6120629380..3f7224f6c806 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google_cloud_iam/default.nix @@ -1,5 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, google_api_core +, libcst +, mock +, proto-plus +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-iam"; @@ -11,12 +20,18 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + pythonImportsCheck = [ + "google.cloud.iam_credentials" + "google.cloud.iam_credentials_v1" + ]; + meta = with lib; { - description = "Google Cloud IAM API client library"; + description = "IAM Service Account Credentials API client library"; homepage = "https://github.com/googleapis/python-iam"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler ]; + maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe0a1555036d..e9ebf1e188d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2553,7 +2553,7 @@ in { google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; - google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { }; + google_cloud_iam = callPackage ../development/python-modules/google_cloud_iam { }; google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; From 094127b5c92f6c8f17348a521867ca0eec28a876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 10:55:11 +0100 Subject: [PATCH 10/69] pythonPackages.google_cloud_org_policy: Rename to fit other packages --- .../default.nix | 2 -- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/development/python-modules/{google-cloud-org-policy => google_cloud_org_policy}/default.nix (95%) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google_cloud_org_policy/default.nix similarity index 95% rename from pkgs/development/python-modules/google-cloud-org-policy/default.nix rename to pkgs/development/python-modules/google_cloud_org_policy/default.nix index 39cc0dc9c24b..4a84053ec604 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google_cloud_org_policy/default.nix @@ -9,8 +9,6 @@ buildPythonPackage rec { sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh"; }; - disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ google_api_core ]; # No tests in repo diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9ebf1e188d6..39744a5feb24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2565,7 +2565,7 @@ 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_org_policy = callPackage ../development/python-modules/google_cloud_org_policy { }; google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; From 4ea516df5eba4dbef866a43e7d39758f7fcbc1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 10:56:41 +0100 Subject: [PATCH 11/69] pythonPackages.google_cloud_os_config: Init at 1.0.0 --- .../google_cloud_os_config/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/google_cloud_os_config/default.nix diff --git a/pkgs/development/python-modules/google_cloud_os_config/default.nix b/pkgs/development/python-modules/google_cloud_os_config/default.nix new file mode 100644 index 000000000000..20e651a54ca3 --- /dev/null +++ b/pkgs/development/python-modules/google_cloud_os_config/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, google_api_core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }: + +buildPythonPackage rec { + pname = "google-cloud-os-config"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07zvagy9hwaccwvg1xad5nkalgkria0maa5yxiwqf1yk9f7gbyq1"; + }; + + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ "google.cloud.osconfig" ]; + + disabledTests = [ + "test_patch_deployment" + "test_patch_job" + ]; + + meta = with lib; { + description = "Google Cloud OS Config API client library"; + homepage = "https://github.com/googleapis/python-os-config"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39744a5feb24..8e9ee4d23a0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2567,6 +2567,8 @@ in { google_cloud_org_policy = callPackage ../development/python-modules/google_cloud_org_policy { }; + google_cloud_os_config = callPackage ../development/python-modules/google_cloud_os_config { }; + google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { }; From eea72ef8326e8466838a3245fa03d29d619c8a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 11:02:48 +0100 Subject: [PATCH 12/69] pythonPackages:google_api_core: 1.23.0 -> 1.24.1 --- .../google_api_core/default.nix | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index efe74d478848..e2b5ae9d8983 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,27 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_auth, protobuf -, googleapis_common_protos, requests, grpcio, mock, pytest, pytest-asyncio, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, google_auth +, googleapis_common_protos +, grpcio +, protobuf +, pytz +, requests +, mock +, pytest +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "google-api-core"; - version = "1.23.0"; - disabled = pythonOlder "3.5"; + version = "1.24.1"; src = fetchPypi { inherit pname version; - sha256 = "1bb3c485c38eacded8d685b1759968f6cf47dd9432922d34edb90359eaa391e2"; + sha256 = "0sflnpgsvk2h1cr1m3mgxx6pzz55xw7sk4y4qdimhs5jdm2fw78g"; }; - propagatedBuildInputs = - [ googleapis_common_protos protobuf google_auth requests grpcio ]; + propagatedBuildInputs = [ + googleapis_common_protos + google_auth + grpcio + protobuf + pytz + requests + ]; - checkInputs = [ google_auth mock protobuf pytest-asyncio pytestCheckHook ]; + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - pythonImportsCheck = [ "google.auth" "google.protobuf" "google.api" ]; + pythonImportsCheck = [ "google.api_core" ]; meta = with lib; { description = "Core Library for Google Client Libraries"; @@ -33,6 +50,6 @@ buildPythonPackage rec { changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b87af9c1b0ca1fcb40ee23c85d4f7b5a5b54306f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 11:05:08 +0100 Subject: [PATCH 13/69] pythonPackages.google_cloud_asset: Fix dependencies, cleanup --- .../google_cloud_asset/default.nix | 43 ++++++++++++++----- 1 file 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 87b1fdf8fc9d..062d47eb5bdb 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"; From 74ad2527e9acc751bb4dab5456e7c06a287b5a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 11:05:34 +0100 Subject: [PATCH 14/69] pythonPackages.googel_cloud_bigcherry_datatransfer: 2.1.0 -> 3.0.0 --- .../default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix index 8c71ac92c994..704ef499d74b 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -2,30 +2,34 @@ , buildPythonPackage , fetchPypi , google_api_core -, pytest +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio , mock }: buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "2.1.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0cca79f6ee312159ec3f3b7fea218c3dd51408d39c429ecbea037982e91cc827"; + sha256 = "0hmsqvs2srmqcwmli48vd5vw829zax3pwj63fsxig6sdhjlf6j7j"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; - checkPhase = '' - pytest tests/unit - ''; + pythonImportsCheck = [ + "google.cloud.bigquery_datatransfer" + "google.cloud.bigquery_datatransfer_v1" + ]; meta = with stdenv.lib; { description = "BigQuery Data Transfer API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-bigquery-datatransfer"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 4fde918f220d851130762fc5b5c7e5234662e25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 11:05:59 +0100 Subject: [PATCH 15/69] pythonPackages.google_cloud_core: 1.4.3 -> 1.5.0 --- .../google_cloud_core/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix index 1ad08ea05af4..bcb9504cb919 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -1,31 +1,38 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, python -, google_api_core, grpcio, mock }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, python +, google_api_core +, grpcio +, mock +}: buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "21afb70c1b0bce8eeb8abb5dca63c5fd37fc8aea18f4b6d60e803bd3d27e6b80"; + sha256 = "01liq4nrd2g3ingg8v0ly4c86db8agnr9h1fiz219c7fz0as0xqj"; }; - disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ google_api_core ]; - propagatedBuildInputs = [ google_api_core grpcio ]; - checkInputs = [ google_api_core mock pytestCheckHook ]; - - pythonImportsCheck = [ "google.cloud" ]; + checkInputs = [ mock pytestCheckHook ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; + pythonImportsCheck = [ "google.cloud" ]; + meta = with stdenv.lib; { description = "API Client library for Google Cloud: Core Helpers"; homepage = "https://github.com/googleapis/python-cloud-core"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From a6dc4d56448066adfb06efdd09c34d37868e377a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 11:06:18 +0100 Subject: [PATCH 16/69] pythonPackages.google_cloud_datastore: 2.0.1 -> 2.1.0 --- .../google_cloud_datastore/default.nix | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix index 07c6cd87237f..9ce64fcfd585 100644 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -3,31 +3,44 @@ , fetchPypi , google_api_core , google_cloud_core -, pytest +, libcst +, proto-plus , mock +, pytestCheckHook +, pytest-asyncio +, google_cloud_testutils }: buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0ebf3b0bcb483e066dfe73679e019e2d7b8c1652e26984702cf5e3f020592f6a"; + sha256 = "1yyk9ix1jms5q4kk76cfxzy42wzzyl5qladdswjy5l0pg6iypr8i"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + propagatedBuildInputs = [ google_api_core google_cloud_core libcst proto-plus ]; - checkPhase = '' + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + + preCheck = '' + # directory shadows imports rm -r google - pytest tests/unit + # requires credentials + rm tests/system/test_system.py ''; + pythonImportsCheck = [ + "google.cloud.datastore" + "google.cloud.datastore_admin_v1" + "google.cloud.datastore_v1" + ]; + meta = with stdenv.lib; { description = "Google Cloud Datastore API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-datastore"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b2fb89e560a5991bff15b68f9daa406692c65a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 11:06:37 +0100 Subject: [PATCH 17/69] pythonPackages.google_cloud_dlp: 2.0.0 -> 3.0.0 --- .../google_cloud_dlp/default.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index a5a602dbeadb..1e89a60a6502 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -1,32 +1,42 @@ { stdenv , buildPythonPackage , fetchPypi -, enum34 , google_api_core -, pytest +, google_cloud_testutils +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio , mock }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "112c8a46979eebd60c3651037e62572fed413977ff2811901aa925c7b7ab9a5a"; + sha256 = "09rnzpdlycr1wv8agcfx05v1prn35ylphsbr07486zqdkh5wjk8p"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_inspect_content" + ]; + + pythonImportsCheck = [ + "google.cloud.dlp" + "google.cloud.dlp_v2" + ]; meta = with stdenv.lib; { description = "Cloud Data Loss Prevention (DLP) API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-dlp"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 2c1b526fadefadd4b6791a2260774a386f32b2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 12:07:24 +0100 Subject: [PATCH 18/69] pythonPackages.google_auth: 1.23.0 -> 1.24.0 --- .../python-modules/google_auth/default.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 3f47a366fba8..abfe3754ccef 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -1,20 +1,29 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder -, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client -, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa -, setuptools, six, urllib3 }: +{ stdenv +, buildPythonPackage +, fetchpatch +, fetchPypi +, pytestCheckHook +, cachetools +, flask +, freezegun +, mock +, oauth2client +, pyasn1-modules +, pytest-localserver +, responses +, rsa +}: buildPythonPackage rec { pname = "google-auth"; - version = "1.23.0"; + version = "1.24.0"; src = fetchPypi { inherit pname version; - sha256 = "5176db85f1e7e837a646cd9cede72c3c404ccf2e3373d9ee14b2db88febad440"; + sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb"; }; - disabled = pythonOlder "3.5"; - - propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; + propagatedBuildInputs = [ pyasn1-modules cachetools rsa ]; checkInputs = [ flask @@ -23,9 +32,12 @@ buildPythonPackage rec { oauth2client pytestCheckHook pytest-localserver - requests responses - urllib3 + ]; + + pythonImportsCheck = [ + "google.auth" + "google.oauth2" ]; meta = with stdenv.lib; { @@ -35,10 +47,8 @@ buildPythonPackage rec { authentication mechanisms to access Google APIs. ''; homepage = "https://github.com/googleapis/google-auth-library-python"; - changelog = - "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; - # Documentation: https://googleapis.dev/python/google-auth/latest/index.html + changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From e976a92b6e51c2e07b905b5205d17409cbb5c613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 12:09:14 +0100 Subject: [PATCH 19/69] pythonPackages.googletrans: cleanup --- .../python-modules/googletrans/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix index 06d008200059..32b839ab11c2 100644 --- a/pkgs/development/python-modules/googletrans/default.nix +++ b/pkgs/development/python-modules/googletrans/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests, pytest, coveralls }: +{ lib, buildPythonPackage, fetchFromGitHub, requests }: buildPythonPackage rec { pname = "googletrans"; @@ -11,17 +11,10 @@ buildPythonPackage rec { sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz"; }; - propagatedBuildInputs = [ - requests - ]; - - checkInputs = [ pytest coveralls ]; + propagatedBuildInputs = [ requests ]; # majority of tests just try to ping Google's Translate API endpoint doCheck = false; - checkPhase = '' - pytest - ''; pythonImportsCheck = [ "googletrans" ]; From 96c5044b2e58c4e5b6efc12ba80643b6fda50200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 12:09:56 +0100 Subject: [PATCH 20/69] pythonPackages.googlemaps: Cleanups --- pkgs/development/python-modules/googlemaps/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 7e13aedec475..39219000bfdd 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -1,6 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv +, buildPythonPackage +, fetchFromGitHub , requests -, responses, pytestCheckHook, pytest, pytestcov, isPy27 +, responses +, pytestCheckHook +, pytestcov +, isPy27 }: buildPythonPackage rec { From 46216c5fa74e4fe0b3d0ff5345ed8504fd702dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 12:19:23 +0100 Subject: [PATCH 21/69] pythonPackages.google_apputils: Disable on python 3 --- pkgs/development/python-modules/google_apputils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/pkgs/development/python-modules/google_apputils/default.nix index c7b386623ef8..b679be9dbf78 100644 --- a/pkgs/development/python-modules/google_apputils/default.nix +++ b/pkgs/development/python-modules/google_apputils/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy3k , pytz , gflags , dateutil @@ -11,10 +12,11 @@ buildPythonPackage rec { pname = "google-apputils"; version = "0.4.2"; + disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "47959d0651c32102c10ad919b8a0ffe0ae85f44b8457ddcf2bdc0358fb03dc29"; + sha256 = "0afw0gxmh0yw5g7xsmw49gs8bbp0zyhbh6fr1b0h48f3a439v5a7"; }; preConfigure = '' @@ -34,6 +36,6 @@ buildPythonPackage rec { description = "Google Application Utilities for Python"; homepage = "https://github.com/google/google-apputils"; license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - } From 7aad6a6a5ceb6af33b94dfcac6172e94ece8e915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 12:25:54 +0100 Subject: [PATCH 22/69] pythonPackages.protobuf: Disable google_apputils on python 3 --- .../python-modules/protobuf/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index ab95eeb51f91..595bab6cfa35 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,6 +1,18 @@ -{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37 -, protobuf, google_apputils, pyext, libcxx, isPy27 -, disabled, doCheck ? true }: +{ buildPackages +, stdenv +, fetchpatch +, python +, buildPythonPackage +, isPy37 +, protobuf +, google_apputils +, six +, pyext +, libcxx +, isPy27 +, disabled +, doCheck ? true +}: with stdenv.lib; @@ -17,9 +29,9 @@ buildPythonPackage { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ google_apputils ]; - propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. - nativeBuildInputs = [ google_apputils pyext ]; + propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google_apputils ]; + propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. + nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google_apputils ]; buildInputs = [ protobuf ]; patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2")) From 7a414d636e5f2f94a8a3779d20d6537ccd725424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 12:29:31 +0100 Subject: [PATCH 23/69] pythonPackages.googleapis_common_protos: Cleanups --- .../googleapis_common_protos/default.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 507c3ba229a6..ea49beee30bb 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,5 +1,10 @@ -{ stdenv, buildPythonPackage, fetchPypi -, protobuf, pytest, setuptools }: +{ stdenv +, buildPythonPackage +, fetchPypi +, grpc +, protobuf +, pytestCheckHook +}: buildPythonPackage rec { pname = "googleapis-common-protos"; @@ -7,18 +12,26 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "560716c807117394da12cecb0a54da5a451b5cf9866f1d37e9a5e2329a665351"; + sha256 = "0lakcsd35qm5x4visvw6z5f1niasv9a0mjyf2bd98wqi0z41c1sn"; }; - propagatedBuildInputs = [ protobuf setuptools ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ grpc protobuf ]; - doCheck = false; # there are no tests + # does not contain tests + doCheck = false; + + pythonImportsCheck = [ + "google.api" + "google.logging" + "google.longrunning" + "google.rpc" + "google.type" + ]; meta = with stdenv.lib; { description = "Common protobufs used in Google APIs"; - homepage = "https://github.com/googleapis/googleapis"; + homepage = "https://github.com/googleapis/python-api-common-protos"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 2ff9969a9725f9f42983baa2d3ced742f5c01124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:04:29 +0100 Subject: [PATCH 24/69] pythonPackages.google_crc32c: 1.0.0 -> 1.1.0, rename to fit other google packages --- .../{google-crc32c => google_crc32c}/default.nix | 14 +++++++------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/development/python-modules/{google-crc32c => google_crc32c}/default.nix (68%) diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google_crc32c/default.nix similarity index 68% rename from pkgs/development/python-modules/google-crc32c/default.nix rename to pkgs/development/python-modules/google_crc32c/default.nix index fbed406cebce..aaf16d9e7c82 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google_crc32c/default.nix @@ -1,31 +1,31 @@ -{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: buildPythonPackage rec { pname = "google-crc32c"; - version = "1.0.0"; - - disabled = !isPy3k; + version = "1.1.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "0n3ggsxmk1fhq0kz6p5rcj4gypfb05i26fcn7lsawakgl7fzxqyl"; + sha256 = "0vbidg9yrv9k8xvk8rl43lsf4cg3dci4a9k4srwwrchbxivz1gr6"; }; - buildInputs = [ crc32c ]; + buildInputs = [ crc32c ]; + propagatedBuildInputs = [ cffi ]; LDFLAGS = "-L${crc32c}/lib"; CFLAGS = "-I${crc32c}/include"; checkInputs = [ pytestCheckHook crc32c ]; + pythonImportsCheck = [ "google_crc32c" ]; meta = with lib; { homepage = "https://github.com/googleapis/python-crc32c"; description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ freezeboy ]; + maintainers = with maintainers; [ freezeboy SuperSandro2000 ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e9ee4d23a0e..bb03ae13bf65 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2605,7 +2605,7 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - google-crc32c = callPackage ../development/python-modules/google-crc32c { + google_crc32c = callPackage ../development/python-modules/google_crc32c { inherit (pkgs) crc32c; }; From 27f18cdddf1bdfbde89b36beb7ca9e318b553c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:20:23 +0100 Subject: [PATCH 25/69] pythonPackages.google_cloud_testutils: Cleanups --- .../python-modules/google_cloud_testutils/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix index dfd6354dcc4b..cf1535e7130e 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, google_auth, pytest, six }: +{ stdenv, buildPythonPackage, fetchPypi, google_auth, six }: buildPythonPackage rec { pname = "google-cloud-testutils"; @@ -11,13 +11,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ google_auth six ]; - # There are no tests + # does not contain tests doCheck = false; + pythonImportsCheck = [ "test_utils" ]; + meta = with stdenv.lib; { description = "System test utilities for google-cloud-python"; homepage = "https://github.com/googleapis/python-test-utils"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b458130133095b18d78f2ed8f110696075abd885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:31:57 +0100 Subject: [PATCH 26/69] pythonPackages.google_resumable_media: 1.1.0 -> 1.2.0 --- .../google_resumable_media/default.nix | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 37bfbfc481ba..4036613e3e25 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -1,38 +1,46 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi -, six -, requests -, setuptools -, pytest +, google_auth +, google_cloud_testutils +, google_crc32c , mock -, crcmod -, google-crc32c +, pytestCheckHook +, pytest-asyncio +, requests }: buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "dcdab13e95bc534d268f87d5293e482cce5bc86dfce6ca0f2e2e89cbb73ef38c"; + sha256 = "0hwxdgsqh6933kp4jkv6hwwdcqs7bgjn9j08ga399njv3s9b367f"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ requests setuptools six ] - ++ lib.optional isPy3k google-crc32c - ++ lib.optional (!isPy3k) crcmod; + propagatedBuildInputs = [ google_auth google_crc32c requests ]; - checkPhase = '' - py.test tests/unit + checkInputs = [ google_auth google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + + preCheck = '' + # prevent shadowing imports + rm -r google + # fixture 'authorized_transport' not found + rm tests/system/requests/test_upload.py + # requires network + rm tests/system/requests/test_download.py ''; + pythonImportsCheck = [ + "google._async_resumable_media" + "google.resumable_media" + ]; + meta = with lib; { description = "Utilities for Google Media Downloads and Resumable Uploads"; homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 2979502a46747f56fdffa3ab93ca443cd25ba082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:33:26 +0100 Subject: [PATCH 27/69] pythonPackages.grpcio: Disable tests, cleanup --- .../python-modules/grpcio/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 55d569c90547..e50f63fe37ac 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,18 @@ -{ stdenv, buildPythonPackage, darwin, grpc -, six, protobuf, enum34, futures, isPy27, pkgconfig -, cython, c-ares, openssl, zlib }: +{ stdenv +, buildPythonPackage +, darwin +, grpc +, six +, protobuf +, enum34 +, futures +, isPy27 +, pkg-config +, cython +, c-ares +, openssl +, zlib +}: buildPythonPackage rec { inherit (grpc) src version; @@ -8,12 +20,12 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cython pkgconfig ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ cython pkg-config ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ c-ares openssl zlib ]; propagatedBuildInputs = [ six protobuf ] - ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; + ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; @@ -22,10 +34,15 @@ buildPythonPackage rec { GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; + # does not contain any tests + doCheck = false; + + pythonImportsCheck = [ "grpc" ]; + meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 807e972ad41b9df69b749d1a82b20ff0acdc0de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:43:51 +0100 Subject: [PATCH 28/69] pythonPackages.proto-plus: 0.11.0 -> 0.13.0 --- .../python-modules/proto-plus/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 4a36b625298d..71949d0d4e09 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -3,28 +3,31 @@ , fetchPypi , isPy3k , protobuf -, google_api_core +, googleapis_common_protos , pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "proto-plus"; - version = "1.11.0"; + version = "1.13.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "416a0f13987789333cd8760a0ee998f8eccd6d7165ee9f283d64ca2de3e8774d"; + sha256 = "1i5jjnwpd288378h37zads08h695iwmhxm0sxbr3ln6aax97rdb1"; }; propagatedBuildInputs = [ protobuf ]; - checkInputs = [ pytestCheckHook google_api_core ]; + checkInputs = [ pytestCheckHook pytz googleapis_common_protos ]; + + pythonImportsCheck = [ "proto" ]; meta = with stdenv.lib; { description = "Beautiful, idiomatic protocol buffers in Python"; homepage = "https://github.com/googleapis/proto-plus-python"; license = licenses.asl20; - maintainers = [ maintainers.ruuda ]; + maintainers = with maintainers; [ ruuda SuperSandro2000 ]; }; } From 6d3fb2bff861f1c71e363adb7e4200baeb4f6a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:45:42 +0100 Subject: [PATCH 29/69] pythonPackages.google_cloud_websecurityscanner: Cleanups --- .../default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index 356759f9bcb5..a8f2741d07de 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -1,5 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google_api_core +, libcst +, mock +, proto-plus +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; @@ -7,18 +15,22 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393"; + sha256 = "14sky9bkl00n65ksig3f6psm31pkmkvlcprlk6s9if470j40zrhx"; }; - disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; checkInputs = [ mock pytest-asyncio pytestCheckHook ]; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + + pythonImportsCheck = [ + "google.cloud.websecurityscanner_v1alpha" + "google.cloud.websecurityscanner_v1beta" + ]; meta = with stdenv.lib; { description = "Google Cloud Web Security Scanner API client library"; homepage = "https://github.com/googleapis/python-websecurityscanner"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 66df5bfc732e9f8b35ef262e69c7a36c75d8a5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:51:57 +0100 Subject: [PATCH 30/69] pythonPackages.google_cloud_vision: Fix dependencies, cleanups --- .../google_cloud_vision/default.nix | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index fd738a522661..801af638d275 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -1,9 +1,12 @@ { stdenv , buildPythonPackage , fetchPypi -, enum34 , google_api_core +, libcst , mock +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { @@ -12,22 +15,27 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6a067d9a661df2e9b356b2772051decfea1971f8d659c246412a165baf827c61"; + sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka"; }; - checkInputs = [ mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + propagatedBuildInputs = [ libcst google_api_core proto-plus]; - # pytest seems to pick up some file which overrides PYTHONPATH - checkPhase = '' - cd tests/unit - python -m unittest discover - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ + "google.cloud.vision" + "google.cloud.vision_helpers" + "google.cloud.vision_v1" + "google.cloud.vision_v1p1beta1" + "google.cloud.vision_v1p2beta1" + "google.cloud.vision_v1p3beta1" + "google.cloud.vision_v1p4beta1" + ]; meta = with stdenv.lib; { description = "Cloud Vision API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-vision"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From bbadd211f71d8ca980a068763013f4fe96ab0da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 13:59:37 +0100 Subject: [PATCH 31/69] pythonPackages.google_cloud_videointelligence: Fix dependencies, cleanups --- .../default.nix | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index b823e105b843..d052b1dcf084 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -1,9 +1,12 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core -, pytest , mock +, google_api_core +, google_cloud_testutils +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { @@ -12,20 +15,31 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "02a91a25b3890a743bde21e03abddf11dcaf7966cc44f09bc8d507f2e28f15fa"; + sha256 = "1yhmizig41ymr2dz0i6ccrwszp0ivyykmq11vqxp82l9ncjima82"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + propagatedBuildInputs = [ google_api_core proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # require credentials + "test_annotate_video" + ]; + + pythonImportsCheck = [ + "google.cloud.videointelligence" + "google.cloud.videointelligence_v1" + "google.cloud.videointelligence_v1beta2" + "google.cloud.videointelligence_v1p1beta1" + "google.cloud.videointelligence_v1p2beta1" + "google.cloud.videointelligence_v1p3beta1" + ]; meta = with stdenv.lib; { description = "Google Cloud Video Intelligence API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-videointelligence"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 03742dfbcaf37efac506e0514f7614d6ceea94c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 14:30:37 +0100 Subject: [PATCH 32/69] pythonPackages.google_cloud_translate: Cleanups --- .../google_cloud_translate/default.nix | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix index 1049895bda1b..f95ac1742d42 100644 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -1,6 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, google_cloud_core, google_cloud_testutils, grpcio, libcst -, mock, proto-plus, pytest-asyncio }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google_api_core +, google_cloud_core +, google_cloud_testutils +, grpcio +, libcst +, mock +, proto-plus +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-translate"; @@ -8,33 +18,29 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6183168465749f007449ef4125356d03cca0114ed49faf7ed64f34ec3edd4fe8"; + sha256 = "1s2gvlzfqd2gsrzaz7yl9q8s1k03dlsjahgg95s017vlcn21d0v1"; }; - disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ google_api_core google_cloud_core libcst proto-plus ]; - # google_cloud_core[grpc] -> grpcio - propagatedBuildInputs = - [ google_api_core google_cloud_core grpcio libcst proto-plus ]; - - checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ]; - - # test_http.py broken, fix not yet released - # https://github.com/googleapis/python-translate/pull/69 - disabledTests = [ - "test_build_api_url_w_extra_query_params" - "test_build_api_url_no_extra_query_params" - "test_build_api_url_w_custom_endpoint" - ]; + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' + # prevent shadowing imports rm -r google ''; + pythonImportsCheck = [ + "google.cloud.translate" + "google.cloud.translate_v2" + "google.cloud.translate_v3" + "google.cloud.translate_v3beta1" + ]; + meta = with stdenv.lib; { description = "Google Cloud Translation API client library"; homepage = "https://github.com/googleapis/python-translate"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From e8bf3efd42e6d8f1545f3a8e2ebe1ea1032f9d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 14:37:46 +0100 Subject: [PATCH 33/69] pythonPackages.google_cloud_trace: Fix depedencies, cleanups --- .../google_cloud_trace/default.nix | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google_cloud_trace/default.nix index b0efb65d0d2f..50a2693f8b51 100644 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -3,8 +3,11 @@ , fetchPypi , google_api_core , google_cloud_core -, pytest +, google_cloud_testutils , mock +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { @@ -13,20 +16,29 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1bd1ee5c274a584929913d9118134e01afe106644cb749ccc3111e1a38a96cd3"; + sha256 = "1lvcm4w1l7hiqg64kdscch3f3bq19q9ii49xj4lljn2a4xffxl8v"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + propagatedBuildInputs = [ google_api_core google_cloud_core proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # require credentials + "test_batch_write_spans" + "test_list_traces" + ]; + + pythonImportsCheck = [ + "google.cloud.trace" + "google.cloud.trace_v1" + "google.cloud.trace_v2" + ]; meta = with stdenv.lib; { - description = "Stackdriver Trace API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + description = "Cloud Trace API client library"; + homepage = "https://github.com/googleapis/python-trace"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 0121e03f8e5bf249ccbe00a8148bb6e5d95a0a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 14:40:07 +0100 Subject: [PATCH 34/69] pythonPackages.google_cloud_texttospeech: Cleanups --- .../google_cloud_texttospeech/default.nix | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index 32e8fa223a88..6b145bfd3f82 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -1,5 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, libcst, mock, proto-plus, pytest-asyncio, }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google_api_core +, libcst +, mock +, proto-plus +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-texttospeech"; @@ -7,21 +15,29 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e"; + sha256 = "17igfwh34369gkvsbrm46j1ii61i6268wg2g2dl9c65nf9z3kgfb"; }; - disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ libcst google_api_core proto-plus ]; checkInputs = [ mock pytest-asyncio pytestCheckHook ]; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - # Disable tests that require credentials - disabledTests = ["test_synthesize_speech" "test_list_voices"]; + disabledTests = [ + # Disable tests that require credentials + "test_list_voices" + "test_synthesize_speech" + ]; + + pythonImportsCheck = [ + "google.cloud.texttospeech" + "google.cloud.texttospeech_v1" + "google.cloud.texttospeech_v1beta1" + ]; meta = with stdenv.lib; { description = "Google Cloud Text-to-Speech API client library"; homepage = "https://github.com/googleapis/python-texttospeech"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From f262a964295a8a60b45e394857b4f80bc74a642c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 14:44:42 +0100 Subject: [PATCH 35/69] pythonPackages.google_cloud_tasks: 2.0.0 -> 2.1.0 --- .../google_cloud_tasks/default.nix | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index ca252b2c5edb..28aa98c94915 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -1,33 +1,44 @@ { stdenv , buildPythonPackage , fetchPypi -, enum34 -, grpc_google_iam_v1 , google_api_core -, pytest +, grpc_google_iam_v1 +, libcst , mock +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "a9dd004057fc441eee8c18bb2dc3bb20ba7b85f353d66894c61e42aeb8764e76"; + sha256 = "1jsf7y88lvln9r08pmx673ibmgw397qmir5drrcfvlmgqvszp7qx"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 libcst proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_queues" + ]; + + pythonImportsCheck = [ + "google.cloud.tasks" + "google.cloud.tasks_v2" + "google.cloud.tasks_v2beta2" + "google.cloud.tasks_v2beta3" + ]; meta = with stdenv.lib; { description = "Cloud Tasks API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-tasks"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From f922908807318122ddb3e7263cd725cdccb98bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 14:45:37 +0100 Subject: [PATCH 36/69] pythonPackages:google_cloud_storage: 1.33.0 -> 1.35.0 --- .../google_cloud_storage/default.nix | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index a1b572db11e5..6bb734c98762 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -1,48 +1,64 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, google_auth, google-cloud-iam, google_cloud_core -, google_cloud_kms, google_cloud_testutils, google_resumable_media, mock -, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google_auth +, google_cloud_iam +, google_cloud_core +, google_cloud_kms +, google_cloud_testutils +, google_resumable_media +, mock +}: buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.33.0"; + version = "1.35.0"; src = fetchPypi { inherit pname version; - sha256 = "900ba027bdee6b97f21cd22d1db3d1a6233ede5de2db4754db860438bdad72d2"; + sha256 = "17kal75wmyjpva7g04cb9yg7qbyrgwfn575z4gqijd4gz2r0sp2m"; }; - disabled = pythonOlder "3.5"; - propagatedBuildInputs = [ - google_api_core google_auth google_cloud_core google_resumable_media - requests ]; + checkInputs = [ - google-cloud-iam + google_cloud_iam google_cloud_kms google_cloud_testutils mock pytestCheckHook ]; - # disable tests which require credentials - disabledTests = [ "create" "get" "post" "test_build_api_url" ]; + # disable tests which require credentials and network access + disabledTests = [ + "create" + "download" + "get" + "post" + "test_build_api_url" + ]; + + pytestFlagsArray = [ + "--ignore=tests/unit/test_bucket.py" + "--ignore=tests/system/test_system.py" + ]; # prevent google directory from shadowing google imports - # remove tests which require credentials preCheck = '' rm -r google - rm tests/system/test_system.py tests/unit/test_client.py ''; + pythonImportsCheck = [ "google.cloud.storage" ]; + meta = with lib; { description = "Google Cloud Storage API client library"; homepage = "https://github.com/googleapis/python-storage"; license = licenses.asl20; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From a40a35d8da599d367117f586e86f58e1dfa4c967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:11:05 +0100 Subject: [PATCH 37/69] pythonPackages.google_cloud_speech: Fix depedencies --- .../google_cloud_speech/default.nix | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index 57b2efb9ebbc..a47298acc335 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -1,5 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi -, google_api_core, pytest, mock }: +{ stdenv +, buildPythonPackage +, fetchPypi +, google_api_core +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-speech"; @@ -7,20 +15,29 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a7428190f4c10440148a273eb4c91480470b34180eec422b7325acdc0b2c0832"; + sha256 = "0ch85h5xrb15fcml5v0f30s0niw02k4v8gi7i8a40161yj882hm7"; }; - propagatedBuildInputs = [ google_api_core ]; - checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ libcst google_api_core proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pytestFlagsArray = [ + # requrire credentials + "--ignore=tests/system/gapic/v1/test_system_speech_v1.py" + "--ignore=tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" + ]; + + pythonImportsCheck = [ + "google.cloud.speech" + "google.cloud.speech_v1" + "google.cloud.speech_v1p1beta1" + ]; meta = with stdenv.lib; { - description = "Cloud Speech API enables integration of Google speech recognition into applications."; - homepage = "https://github.com/googleapis/google-cloud-python/tree/master/speech"; + description = "Google Cloud Speech API client library"; + homepage = "https://github.com/googleapis/python-speech"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 93085779d9d0e6df7aed3216bfc9be1d1781544a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:29:11 +0100 Subject: [PATCH 38/69] pythonPackages.google_cloud_spanner: 2.0.0 -> 2.1.0 --- .../google_cloud_spanner/default.nix | 57 +++++++++++++------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index 38bd65aa091d..3d34f22f3c14 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -1,33 +1,54 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, grpc_google_iam_v1, grpcio-gcp, google_api_core, google_cloud_core -, google_cloud_testutils, mock, pytest }: +{ stdenv +, buildPythonPackage +, fetchPypi +, grpc_google_iam_v1 +, google_cloud_core +, google_cloud_testutils +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +, sqlparse +}: buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "edac9d86ea2d8e87c048423f610cd3e5dbb6f9db7f1f9353ff133014689e97c6"; + sha256 = "0mkkx6l3cbwfwng12zpisbv6m919fkhdb48xk24ayc19193bi86n"; }; - disabled = pythonOlder "3.5"; - - checkInputs = [ google_cloud_testutils mock pytestCheckHook ]; - propagatedBuildInputs = - [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; - - # prevent google directory from shadowing google imports - # remove tests that require credentials - preCheck = '' - rm -r google - rm tests/system/test_system.py + postPatch = '' + substituteInPlace setup.py \ + --replace '"proto-plus == 1.11.0"' '"proto-plus"' ''; + propagatedBuildInputs = [ google_cloud_core grpc_google_iam_v1 libcst proto-plus sqlparse ]; + + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + + preCheck = '' + # prevent google directory from shadowing google imports + rm -r google + # disable tests which require credentials + rm tests/system/test_{system,system_dbapi}.py + rm tests/unit/spanner_dbapi/test_{connect,connection,cursor}.py + ''; + + pythonImportsCheck = [ + "google.cloud.spanner_admin_database_v1" + "google.cloud.spanner_admin_instance_v1" + "google.cloud.spanner_dbapi" + "google.cloud.spanner_v1" + ]; + meta = with stdenv.lib; { description = "Cloud Spanner API client library"; - homepage = "https://pypi.org/project/google-cloud-spanner"; + homepage = "https://github.com/googleapis/python-spanner"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 61b774799255431de774a1b600b5fa609d96b941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:35:50 +0100 Subject: [PATCH 39/69] pythonPackages.google_cloud_securitycenter: 1.0.0 -> 1.1.0 --- .../google_cloud_securitycenter/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index cad4b0799c28..73f481abd27a 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -1,33 +1,39 @@ { stdenv , buildPythonPackage , fetchPypi -, enum34 , grpc_google_iam_v1 , google_api_core -, pytest +, libcst , mock +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "45d47a4389f2f19958a9db8e5c2f169c9b9385e74338fef0a4e49160153df7f7"; + sha256 = "1lgz6qpsfv4b7p5ff4sdpjpaddxpbazdvlcrqr1i0c0qil2lkm2i"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ + "google.cloud.securitycenter" + "google.cloud.securitycenter_v1" + "google.cloud.securitycenter_v1beta1" + "google.cloud.securitycenter_v1p1beta1" + ]; meta = with stdenv.lib; { description = "Cloud Security Command Center API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-securitycenter"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b92abee84d712b50adfcf93f01c00c99e5b6e14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:39:52 +0100 Subject: [PATCH 40/69] pythonPackages.google_cloud_secret_manager: Cleanups --- .../google_cloud_secret_manager/default.nix | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix index c744701c7789..8b84b55c93ec 100644 --- a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix @@ -1,6 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi -, grpc_google_iam_v1, google_api_core, libcst, proto-plus -, pytest, mock +{ lib +, buildPythonPackage +, fetchPypi +, google_api_core +, grpc_google_iam_v1 +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { @@ -9,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2f08b49164aca8623b2e4ee07352980b3ffca909ce205c03568e203bbc455c30"; + sha256 = "0c2w8ny3n84faq1mq86f16lzqgqbk1977q2f5qxn5a5ccj8v821g"; }; propagatedBuildInputs = [ @@ -21,16 +28,20 @@ buildPythonPackage rec { checkInputs = [ mock - pytest + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.secretmanager" + "google.cloud.secretmanager_v1" + "google.cloud.secretmanager_v1beta1" ]; - checkPhase = '' - pytest - ''; meta = with lib; { - description = "Secret Manager API: Stores, manages, and secures access to application secrets"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + description = "Secret Manager API API client library"; + homepage = "https://github.com/googleapis/python-secret-manager"; license = licenses.asl20; - maintainers = with maintainers; [ siriobalmelli ]; + maintainers = with maintainers; [ siriobalmelli SuperSandro2000 ]; }; } From 32e25e4c3cd8ece15cda2b3256bd51377dccc2a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:42:26 +0100 Subject: [PATCH 41/69] pythonPackages.google_cloud_runtimeconfig: Cleanups --- .../google_cloud_runtimeconfig/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index d4fb4c59a18c..4269943d08ea 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -1,5 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_api_core, google_cloud_core, mock }: +{ stdenv +, buildPythonPackage +, fetchPypi +, google_api_core +, google_cloud_core +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; @@ -7,28 +13,27 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "57143ec3c5ed3e0bee590a98857eec06c68aa2eacbce477403226a0d2e85a8ad"; + sha256 = "1bd8hlp0ssi20ds4gknbxai8mih6xiz8b60ab7p0ngpdqp1kw52p"; }; - disabled = pythonOlder "3.5"; - - checkInputs = [ mock pytestCheckHook ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; - # api_url test broken, fix not yet released - # https://github.com/googleapis/python-resource-manager/pull/31 + checkInputs = [ mock pytestCheckHook ]; + # Client tests require credentials - disabledTests = [ "build_api_url_w_custom_endpoint" "client_options" ]; + disabledTests = [ "client_options" ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; + pythonImportsCheck = [ "google.cloud.runtimeconfig" ]; + meta = with stdenv.lib; { description = "Google Cloud RuntimeConfig API client library"; homepage = "https://pypi.org/project/google-cloud-runtimeconfig"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From a3a1091deefd749dcec184341a8129e644bb148c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:44:21 +0100 Subject: [PATCH 42/69] pythonPackages.google_cloud_resource_manager: Cleanups --- .../google_cloud_resource_manager/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index 815ecc118f9b..e8c47cc77596 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -1,5 +1,11 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_cloud_core, google_api_core, mock, pytest }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google_cloud_core +, google_api_core +, mock +}: buildPythonPackage rec { pname = "google-cloud-resource-manager"; @@ -7,28 +13,24 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3577bbf38f2c7c2f42306b8dfdeffbb0eedf45aaec947fd513d51937f72046d1"; + sha256 = "1la643vkf6fm2gapz57cm92xzvmhzgpzv3bb6112yz1cizrvnxrm"; }; - disabled = pythonOlder "3.5"; - - checkInputs = [ mock pytestCheckHook ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; - # api_url test broken, fix not yet released - # https://github.com/googleapis/python-resource-manager/pull/31 - disabledTests = - [ "api_url_no_extra_query_param" "api_url_w_custom_endpoint" ]; + checkInputs = [ mock pytestCheckHook ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; + pythonImportsCheck = [ "google.cloud.resource_manager" ]; + meta = with stdenv.lib; { description = "Google Cloud Resource Manager API client library"; homepage = "https://github.com/googleapis/python-resource-manager"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b7af3508d55b329493da30b2107c52a2a8844b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:48:04 +0100 Subject: [PATCH 43/69] pythonPackages.google_cloud_redis: Fix dependenices, cleanups --- .../google_cloud_redis/default.nix | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix index 3337d9f3c55b..734f7650b316 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google_cloud_redis/default.nix @@ -1,10 +1,12 @@ { stdenv , buildPythonPackage , fetchPypi -, enum34 , google_api_core -, pytest +, libcst , mock +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { @@ -13,26 +15,23 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c783118462d9272fb9f519ef43b6ce383e99ad631e922a1f06fbef7148aec7b8"; + sha256 = "1f67mr473vzv0qgjm4hycfnrjgiqrsv47vqrynwjy9yrca2130y7"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - # requires old version of google-api-core (override) - preBuild = '' - sed -i "s/'google-api-core\[grpc\] >= 0.1.0, < 0.2.0dev'/'google-api-core'/g" setup.py - sed -i "s/google-api-core\[grpc\]<0.2.0dev,>=0.1.0/google-api-core/g" google_cloud_redis.egg-info/requires.txt - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; - checkPhase = '' - pytest tests/unit - ''; + pythonImportsCheck = [ + "google.cloud.redis" + "google.cloud.redis_v1" + "google.cloud.redis_v1beta1" + ]; meta = with stdenv.lib; { description = "Google Cloud Memorystore for Redis API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-redis"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 414f4f4ac92aa6932657c2460e6ccf3ba402d8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:50:57 +0100 Subject: [PATCH 44/69] pythonPackages.google_cloud_pubsub: Cleanups --- .../google_cloud_pubsub/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index b7b810370f98..4c6e08c91f5d 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -1,6 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook -, google_api_core, google_cloud_testutils, grpc_google_iam_v1, libcst, mock -, proto-plus, pytest-asyncio }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google_api_core +, google_cloud_testutils +, grpc_google_iam_v1 +, libcst +, mock +, proto-plus +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-pubsub"; @@ -8,19 +17,17 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "bc50a60803f5c409a295ec0e31cdd4acc271611ce3f4963a072036bbfa5ccde5"; + sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w"; }; - disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; - propagatedBuildInputs = - [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; - # prevent google directory from shadowing google imports - # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com preCheck = '' + # prevent google directory from shadowing google imports rm -r google + # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com rm -r tests/unit/pubsub_v1 ''; @@ -30,6 +37,6 @@ buildPythonPackage rec { description = "Google Cloud Pub/Sub API client library"; homepage = "https://pypi.org/project/google-cloud-pubsub"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 6eae485e9fb1a8cc670e59628d7b6bf9572b9687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:52:26 +0100 Subject: [PATCH 45/69] pythonPackages.google_cloud_org_policy: Add SuperSandro2000 as maintainer --- .../python-modules/google_cloud_org_policy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google_cloud_org_policy/default.nix b/pkgs/development/python-modules/google_cloud_org_policy/default.nix index 4a84053ec604..033706fa4ffd 100644 --- a/pkgs/development/python-modules/google_cloud_org_policy/default.nix +++ b/pkgs/development/python-modules/google_cloud_org_policy/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Protobufs for Google Cloud Organization Policy."; homepage = "https://github.com/googleapis/python-org-policy"; license = licenses.asl20; - maintainers = with maintainers; [ austinbutler ]; + maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; } From 2babbb5f8a9ae6c2c06f973034406813898f3d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 15:57:40 +0100 Subject: [PATCH 46/69] pythonPackages.google_cloud_monitoring: Fix dependencies, cleanups --- .../google_cloud_monitoring/default.nix | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index 99557565e63a..c1890d99a040 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -2,8 +2,11 @@ , buildPythonPackage , fetchPypi , google_api_core -, pandas -, pytest +, google_cloud_testutils +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio , mock }: @@ -13,20 +16,27 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1debfa046ab9518d46b68712c03d86d0ddb11d1aad428aed62c6465752f2201f"; + sha256 = "07r0y995fin6cbnqlhmd38fv3pfhhqyw04l7nr38sldrd82gmsqx"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core pandas ]; + propagatedBuildInputs = [ libcst google_api_core proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_monitored_resource_descriptors" + ]; + + pythonImportsCheck = [ + "google.cloud.monitoring" + "google.cloud.monitoring_v3" + ]; meta = with stdenv.lib; { description = "Stackdriver Monitoring API client library"; homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From f7507ffa9547e6bb0387ce4302ac43aab9b15e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:06:29 +0100 Subject: [PATCH 47/69] pythonPackages.google_cloud_logging: 2.0.0 -> 2.0.2 --- .../google_cloud_logging/default.nix | 55 +++++++++++++------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix index 96473edd583b..ec187f82f7bf 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -1,38 +1,59 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, django -, flask, google_api_core, google_cloud_core, google_cloud_testutils, mock -, webapp2 }: +{ stdenv +, buildPythonPackage +, fetchPypi +, django +, flask +, google_api_core +, google_cloud_core +, google_cloud_testutils +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +, webapp2 +}: buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.0.0"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "c8e4869ec22aa7958ff937c1acbd34d7a2a8a446af9a09ce442f24128eee063c"; + sha256 = "0s09vs4rnq4637j8zw7grv3f4j7njqprm744b1knzldj91rg0vmi"; }; - disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ google_api_core google_cloud_core proto-plus ]; - checkInputs = - [ django flask google_cloud_testutils mock pytestCheckHook webapp2 ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + checkInputs = [ + django + flask + google_cloud_testutils + mock + pytestCheckHook + pytest-asyncio + ]; - # api_url test broken, fix not yet released - # https://github.com/googleapis/python-logging/pull/66 - disabledTests = - [ "test_build_api_url_w_custom_endpoint" "test_write_log_entries" ]; + disabledTests = [ + # requires credentials + "test_write_log_entries" + ]; - # prevent google directory from shadowing google imports - # remove system integration tests preCheck = '' + # prevent google directory from shadowing google imports rm -r google - rm tests/system/test_system.py + # requires credentials + rm tests/system/test_system.py tests/unit/test__gapic.py ''; + pythonImortsCheck = [ + "google.cloud.logging" + "google.cloud.logging_v2" + ]; + meta = with stdenv.lib; { description = "Stackdriver Logging API client library"; homepage = "https://github.com/googleapis/python-logging"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 89466bac4a5450ec03126bf12a9de06549d85b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:10:00 +0100 Subject: [PATCH 48/69] pythonPackages.tbm-utils: Fix dependencies --- pkgs/development/python-modules/tbm-utils/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index 2d0efeceda04..bcc5cbbef946 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -5,17 +5,15 @@ , pendulum , pprintpp , wrapt -, pythonOlder }: buildPythonPackage rec { pname = "tbm-utils"; version = "2.6.0"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "235748cceeb22c042e32d2fdfd4d710021bac9b938c4f2c35e1fce1cfd58f7ec"; + sha256 = "1v7pb3yirkhzbv1z5i1qp74vl880f56zvzfj68p08b5jxv64hmr3"; }; propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; @@ -24,7 +22,7 @@ buildPythonPackage rec { # issues with package failing to build from source, but nixpkgs is better postPatch = '' substituteInPlace setup.py \ - --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + --replace "'attrs>=18.2,<19.4'" "'attrs'" ''; # No tests in archive. From dc711a8582b832867073158cdd11dbd42823cfed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:14:17 +0100 Subject: [PATCH 49/69] pythonPackages.audio-metadata: Fix dependencies --- .../development/python-modules/audio-metadata/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index 1adee4403b9b..fc3adf2534e7 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib, buildPythonPackage, fetchPypi , attrs , bidict , bitstruct @@ -18,9 +18,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "bidict>=0.17,<0.18" "bidict" \ - --replace "more-itertools>=4.0,<8.0" "more-itertools" \ - --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + --replace "'attrs>=18.2,<19.4'" "'attrs'" ''; propagatedBuildInputs = [ @@ -35,8 +33,6 @@ buildPythonPackage rec { # No tests doCheck = false; - disabled = pythonOlder "3.6"; - meta = with lib; { homepage = "https://github.com/thebigmunch/audio-metadata"; description = "A library for reading and, in the future, writing metadata from audio files"; From 3ef3da397da8a35a57e87d4e6a217f3987c8965f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:16:56 +0100 Subject: [PATCH 50/69] pythonPackages.google-music-proto: Fix dependencies --- .../python-modules/google-music-proto/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index 16363192c81b..a883f707bdf1 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , attrs , audio-metadata , importlib-metadata @@ -10,7 +13,6 @@ buildPythonPackage rec { pname = "google-music-proto"; version = "2.10.0"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -20,7 +22,7 @@ buildPythonPackage rec { postPatch = '' sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py substituteInPlace setup.py \ - --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + --replace "'attrs>=18.2,<19.4'" "'attrs'" ''; propagatedBuildInputs = [ From 37206fb46599993181dfbbe037643ff3a2c88002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:17:28 +0100 Subject: [PATCH 51/69] pythonPackages.google-music: Enable on newer python versions --- pkgs/development/python-modules/google-music/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index 9d2f0def99b2..e5b42c5310f7 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi , appdirs , audio-metadata , google-music-proto @@ -14,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b79956cc0df86345c74436ae6213b700345403c91d51947288806b174322573b"; + sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp"; }; postPatch = '' @@ -35,8 +37,6 @@ buildPythonPackage rec { # No tests doCheck = false; - disabled = pythonOlder "3.6"; - meta = with lib; { homepage = "https://github.com/thebigmunch/google-music"; description = "A Google Music API wrapper"; From d5942f037c926064faff0f5e8485ff0514a4ddd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:19:05 +0100 Subject: [PATCH 52/69] pythonPackages.google-i18n-address: Use pytestCheckHook --- .../python-modules/google-i18n-address/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 56a77258c8aa..590962590e5f 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib, requests, pytest, pytestcov, mock }: +{ buildPythonPackage, fetchPypi, lib, requests, pytestCheckHook, mock }: buildPythonPackage rec { pname = "google-i18n-address"; @@ -11,12 +11,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytestcov mock ]; + checkInputs = [ pytestCheckHook mock ]; meta = with lib; { description = "Google's i18n address data packaged for Python"; homepage = "https://pypi.org/project/google-i18n-address/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; license = licenses.bsd3; }; } From 8962aaba30c2136b61b8240a5d4c446928781e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:20:18 +0100 Subject: [PATCH 53/69] pythonPackages.google-music-utils: 2.1.0 -> 2.5.0 --- .../google-music-utils/default.nix | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix index b7fd2738e048..cf241b15578d 100644 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -1,30 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, audio-metadata, multidict, wrapt -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, audio-metadata +, multidict +, wrapt +, poetry +, pytestCheckHook }: buildPythonPackage rec { pname = "google-music-utils"; - version = "2.1.0"; + version = "2.5.0"; # Pypi tarball doesn't contain tests src = fetchFromGitHub { owner = "thebigmunch"; repo = "google-music-utils"; rev = version; - sha256 = "0fn4zp0gf1wx2x06dbc840qcq21j4p3ajghxp7646w2n6n9gxhh7"; + sha256 = "0vwbrgakk23fypjspmscz4gllnb3dksv2njy4j4bm8vyr6fwbi5f"; }; + format = "pyproject"; - propagatedBuildInputs = [ - audio-metadata multidict wrapt - ]; - - checkInputs = [ pytest ]; - checkPhase = '' - pytest + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'multidict = "^4.0"' 'multidict = ">4.0"' ''; - disabled = pythonOlder "3.6"; + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ audio-metadata multidict /*wrapt*/ ]; + + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/thebigmunch/google-music-utils"; From e83b75d4650acea3fd8823be239ef981d6927930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 21:52:28 +0100 Subject: [PATCH 54/69] music utils --- pkgs/development/python-modules/google-music-utils/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix index cf241b15578d..801b4b78a178 100644 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , audio-metadata , multidict -, wrapt , poetry , pytestCheckHook }: @@ -28,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry ]; - propagatedBuildInputs = [ audio-metadata multidict /*wrapt*/ ]; + propagatedBuildInputs = [ audio-metadata multidict ]; checkInputs = [ pytestCheckHook ]; From 284f4fd69c481e70a33838a03a8d2dd2ed901d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:29:04 +0100 Subject: [PATCH 55/69] pythonPackages.google-auth-httplib2: Cleanups --- .../google-auth-httplib2/default.nix | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index ff5aa3b2bac7..71abc249e7b2 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -3,13 +3,11 @@ , buildPythonPackage , fetchPypi , flask -, mock -, six -, pytest -, pytest-localserver , google_auth , httplib2 - +, mock +, pytestCheckHook +, pytest-localserver }: buildPythonPackage rec { @@ -18,28 +16,25 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8d092cc60fb16517b12057ec0bba9185a96e3b7169d86ae12eae98e645b7bc39"; + sha256 = "0fdwnx2yd65f5vhnmn39f4xnxac5j6x0pv2p42qifrdi1z32q2cd"; }; - checkInputs = [ - flask mock six pytest pytest-localserver - ]; - propagatedBuildInputs = [ - google_auth httplib2 + google_auth + httplib2 ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + flask + mock + pytestCheckHook + pytest-localserver + ]; - # ImportError: No module named google.auth - doCheck = isPy3k; - - meta = { + meta = with lib; { description = "Google Authentication Library: httplib2 transport"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; - license = lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - } From 11ef6fdd9c9e641b39e56bf13e6e644becc4fa26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:30:32 +0100 Subject: [PATCH 56/69] pythonPackages.google-auth-oauthlib: Cleanups --- .../google-auth-oauthlib/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index bdea58de8999..17a98d7814e4 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -1,12 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder -, isPy3k , click , mock -, pytest -, futures +, pytestCheckHook , google_auth , requests_oauthlib }: @@ -14,31 +11,27 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; version = "0.4.2"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65b65bc39ad8cab15039b35e5898455d3d66296d0584d96fe0e79d67d04c51d9"; + sha256 = "1nai9k86g7g7w1pxk105dllncgax8nc5hpmk758b3jnqkb1mpdk5"; }; - checkInputs = [ - click mock pytest - ] ++ lib.optionals (!isPy3k) [ futures ]; - propagatedBuildInputs = [ - google_auth requests_oauthlib + google_auth + requests_oauthlib ]; - doCheck = isPy3k; - checkPhase = '' - rm -fr tests/__pycache__/ google - py.test - ''; + checkInputs = [ + click + mock + pytestCheckHook + ]; meta = with lib; { description = "Google Authentication Library: oauthlib integration"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; license = licenses.asl20; - maintainers = with maintainers; [ terlar ]; + maintainers = with maintainers; [ SuperSandro2000 terlar ]; }; } From d09275671a5c73325237ee846063790c28713d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:36:30 +0100 Subject: [PATCH 57/69] pythonPackages.google_cloud_asset: Fix dependencies, cleanups --- .../python-modules/google_cloud_asset/default.nix | 13 +++---------- 1 file changed, 3 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 062d47eb5bdb..79a47bb5096f 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -1,12 +1,12 @@ { stdenv , buildPythonPackage , fetchPypi -, pythonOlder , grpc_google_iam_v1 , google_api_core , google_cloud_access_context_manager , google_cloud_org_policy , google_cloud_os_config +, google_cloud_testutils , libcst , proto-plus , pytest @@ -34,14 +34,7 @@ buildPythonPackage rec { 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" ]; + checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ]; pythonImportsCheck = [ "google.cloud.asset" @@ -56,6 +49,6 @@ buildPythonPackage rec { description = "Python Client for Google Cloud Asset API"; homepage = "https://github.com/googleapis/python-asset"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 557dbd85e8abd97eab6b4bed7490c4739697bbd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:43:21 +0100 Subject: [PATCH 58/69] pythonPackages.google_cloud_automl: CLeanups --- .../google_cloud_automl/default.nix | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index 3ad8dcb12fb3..3352cbc8b1e1 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -1,6 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, libcst -, google_api_core, google_cloud_storage, google_cloud_testutils, pandas -, proto-plus, pytest-asyncio, mock }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, libcst +, google_api_core +, google_cloud_storage +, google_cloud_testutils +, pandas +, proto-plus +, pytest-asyncio +, mock +}: buildPythonPackage rec { pname = "google-cloud-automl"; @@ -11,7 +21,7 @@ buildPythonPackage rec { sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696"; }; - disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; checkInputs = [ google_cloud_storage @@ -21,19 +31,29 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook ]; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - # ignore tests which need credentials - disabledTests = [ "test_prediction_client_client_info" ]; preCheck = '' + # do not shadow imports rm -r google + # requires credentials rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py ''; + disabledTests = [ + # requires credentials + "test_prediction_client_client_info" + ]; + + pythonImportsCheck = [ + "google.cloud.automl" + "google.cloud.automl_v1" + "google.cloud.automl_v1beta1" + ]; + meta = with stdenv.lib; { description = "Cloud AutoML API client library"; homepage = "https://github.com/googleapis/python-automl"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 8b485811f25e01a36c2548610fcffcad9bd2e164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:55:40 +0100 Subject: [PATCH 59/69] pythonPackages.google_cloud_dataproc: Cleanups --- .../google_cloud_dataproc/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index b0067d4316da..5b4d4f255299 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -2,10 +2,11 @@ , buildPythonPackage , fetchPypi , google_api_core -, pytest , mock , libcst , proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { @@ -14,20 +15,28 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "81c44ac114c94df8f5b21245e5e7fc4eabce66b25fc432c3696b62b5de143b1f"; + sha256 = "07rv2kgbaqkbd71k5i2zn9kcxasfzkkyai8jnbszhkf92k0lmi41"; }; - checkInputs = [ pytest mock ]; propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_clusters" + ]; + + pythonImportsCheck = [ + "google.cloud.dataproc" + "google.cloud.dataproc_v1" + "google.cloud.dataproc_v1beta2" + ]; meta = with stdenv.lib; { description = "Google Cloud Dataproc API client library"; homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 021c6f2d98835690c784fc4b23beb2947559fd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 16:57:05 +0100 Subject: [PATCH 60/69] pythonPackages.google_cloud_error_reporting: Cleanups --- .../google_cloud_error_reporting/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix index 19f90275ae99..196ec4a912b7 100644 --- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix @@ -1,6 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, google_cloud_logging, google_cloud_testutils, libcst, mock, proto-plus -, pytest-asyncio }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, google_cloud_logging +, google_cloud_testutils +, libcst +, mock +, proto-plus +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-error-reporting"; @@ -11,13 +19,16 @@ buildPythonPackage rec { sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4"; }; - disabled = pythonOlder "3.6"; - - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ]; - # Disable tests that require credentials - disabledTests = [ "test_report_error_event" "test_report_exception" ]; + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # require credentials + "test_report_error_event" + "test_report_exception" + ]; + # prevent google directory from shadowing google imports preCheck = '' rm -r google @@ -27,6 +38,6 @@ buildPythonPackage rec { description = "Stackdriver Error Reporting API client library"; homepage = "https://github.com/googleapis/python-error-reporting"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 116e79305902c49428d15459cb29278055b37f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 21:48:27 +0100 Subject: [PATCH 61/69] pythonPackages.google_cloud_kms: Cleanups --- .../google_cloud_kms/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index a4d2439fb49c..0000e39685c2 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -1,5 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder -, grpc_google_iam_v1, google_api_core, libcst, mock, proto-plus, pytest-asyncio +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, grpc_google_iam_v1 +, google_api_core +, libcst +, mock +, proto-plus +, pytest-asyncio }: buildPythonPackage rec { @@ -11,19 +19,22 @@ buildPythonPackage rec { sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga"; }; - disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; - propagatedBuildInputs = - [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; # Disable tests that need credentials disabledTests = [ "test_list_global_key_rings" ]; + pythonImportsCheck = [ + "google.cloud.kms" + "google.cloud.kms_v1" + ]; + meta = with stdenv.lib; { description = "Cloud Key Management Service (KMS) API API client library"; homepage = "https://github.com/googleapis/python-kms"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From ee7e7c386475082ff7b259d9355a99e3e0a7a6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 22:31:46 +0100 Subject: [PATCH 62/69] pythonPackages.google_cloud_container: Cleanups --- .../google_cloud_container/default.nix | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix index c5415b84ba1f..69c142171ad6 100644 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/pkgs/development/python-modules/google_cloud_container/default.nix @@ -1,5 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, google_api_core -, grpc_google_iam_v1, libcst, mock, proto-plus, pytest, pytest-asyncio }: +{ stdenv +, buildPythonPackage +, fetchPypi +, google_api_core +, grpc_google_iam_v1 +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +}: buildPythonPackage rec { pname = "google-cloud-container"; @@ -7,23 +16,28 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0dcd8084dd55c0439ff065d3fb206e2e5c695d3a25effd774b74f8ce43afc911"; + sha256 = "04f9mx1wxy3l9dvzvvr579fnjp1fdqhgplv5y2gl7h2mvn281k8d"; }; - disabled = pythonOlder "3.6"; + propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 libcst proto-plus ]; - checkInputs = [ mock pytest pytest-asyncio ]; - propagatedBuildInputs = - [ google_api_core grpc_google_iam_v1 libcst proto-plus ]; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; - checkPhase = '' - pytest tests/unit - ''; + disabledTests = [ + # requires credentials + "test_list_clusters" + ]; + + pythonImportsCheck = [ + "google.cloud.container" + "google.cloud.container_v1" + "google.cloud.container_v1beta1" + ]; meta = with stdenv.lib; { description = "Google Container Engine API client library"; homepage = "https://github.com/googleapis/python-container"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 8e364d01429f71916eba7f2da752dbc48ba60611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 23:24:53 +0100 Subject: [PATCH 63/69] pythonPackages.google_cloud_firestore: 2.0.1 -> 2.0.2, cleanups --- .../google_cloud_firestore/default.nix | 53 ++++++++++++++----- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index 4f819bbf9bfa..b69f9e75d9a2 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -1,35 +1,64 @@ { stdenv , buildPythonPackage , fetchPypi +, aiounittest , google_api_core +, google_cloud_testutils , google_cloud_core -, pytest +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "ae1f58d9174a6fb2c9fd2758c6d4fd237fb4f0decc632b80c217bfbceda38eb6"; + sha256 = "1q5s2gpkibnjxal9zrz02jfnazf7rxk0bi0ln5a3di6i47kjnga9"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + propagatedBuildInputs = [ + google_api_core + google_cloud_core + proto-plus + ]; - # tests were not included with release - # See issue https://github.com/googleapis/google-cloud-python/issues/6380 - doCheck = false; + checkInputs = [ + aiounittest + google_cloud_testutils + mock + pytestCheckHook + pytest-asyncio + ]; - checkPhase = '' - pytest tests/unit + preCheck = '' + # do not shadow imports + rm -r google ''; + pytestFlagsArray = [ + # tests are broken + "--ignore=tests/system/test_system.py" + "--ignore=tests/system/test_system_async.py" + ]; + + disabledTests = [ + # requires credentials + "test_collections" + ]; + + pythonImportsCheck = [ + "google.cloud.firestore_v1" + "google.cloud.firestore_admin_v1" + ]; + meta = with stdenv.lib; { description = "Google Cloud Firestore API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-firestore"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From baa35df4e1ca0f7e5eeb66e8a3da76b3cb5025be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 23:39:27 +0100 Subject: [PATCH 64/69] pythonPackages.google_cloud_dns: Cleanups, fix tests --- .../google_cloud_dns/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google_cloud_dns/default.nix index d488b7ad5632..7cccad0e6c5d 100644 --- a/pkgs/development/python-modules/google_cloud_dns/default.nix +++ b/pkgs/development/python-modules/google_cloud_dns/default.nix @@ -3,7 +3,7 @@ , fetchPypi , google_api_core , google_cloud_core -, pytest +, pytestCheckHook , mock }: @@ -13,21 +13,29 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7264e58067b55535ee859e124bd3da29337698ef6bb293da667d0316ddbe8606"; + sha256 = "01l6pvfic0vxcvd97ckbxyc7ccr9vb9ln4lyhpp3amdmcy0far3j"; }; - checkInputs = [ pytest mock ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; - checkPhase = '' + checkInputs = [ mock pytestCheckHook ]; + + preCheck = '' + # don#t shadow python imports rm -r google - pytest tests/unit ''; + disabledTests = [ + # requires credentials + "test_quota" + ]; + + pythonImportsCheck = [ "google.cloud.dns" ]; + meta = with stdenv.lib; { description = "Google Cloud DNS API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-dns"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 7a6095501d01ed8a2fe8ff89922d67be6fa6ccbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Jan 2021 23:57:37 +0100 Subject: [PATCH 65/69] pythonPackages.google_cloud_iot: Fix depedencies, cleanups --- .../google_cloud_iot/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix index 96364cfd7029..d5b9cbf127ec 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google_cloud_iot/default.nix @@ -1,10 +1,12 @@ { stdenv , buildPythonPackage , fetchPypi -, enum34 , grpc_google_iam_v1 , google_api_core -, pytest +, libcst +, proto-plus +, pytestCheckHook +, pytest-asyncio , mock }: @@ -14,20 +16,27 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8af2be9c74697a350d5cc8ead00ae6cb4e85943564f1d782e8060d0d5eb15723"; + sha256 = "08spn5g0s386x21dgwb46na8aknbwq5d1sn8bh6kayk9fjfbxwla"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + disabledTests = [ + # requires credentials + "test_list_device_registries" + ]; + + pythonImportsCheck = [ + "google.cloud.iot" + "google.cloud.iot_v1" + ]; meta = with stdenv.lib; { description = "Cloud IoT API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-iot"; license = licenses.asl20; - # maintainers = [ maintainers. ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From b09309b027fe2fb5e6a9ee40b8fb7c16fa561449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 00:03:30 +0100 Subject: [PATCH 66/69] pythonPackages.google_cloud_language: Fix dependencies, cleanups --- .../google_cloud_language/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google_cloud_language/default.nix index 4f3defb4e4b9..585ea5ef973f 100644 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ b/pkgs/development/python-modules/google_cloud_language/default.nix @@ -1,10 +1,12 @@ { stdenv , buildPythonPackage , fetchPypi -, enum34 , google_api_core -, pytest +, libcst , mock +, proto-plus +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { @@ -13,20 +15,23 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "abe7abcd64d25ffdf6d063385869ef8f34a7de421d5676541cd6df63b3c37b88"; + sha256 = "123vqfrn7pyn3ia7cmhx8bgafd4gxxlmhf33s3vgspyjck6sprxb"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + pythonImportsCheck = [ + "google.cloud.language" + "google.cloud.language_v1" + "google.cloud.language_v1beta2" + ]; meta = with stdenv.lib; { description = "Google Cloud Natural Language API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-language"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 00d6056151c8c8f6a7c62699863496721220ba25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 01:37:28 +0100 Subject: [PATCH 67/69] flatbuffers: Disable tests temporarily --- pkgs/development/libraries/flatbuffers/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 922eba4335c9..0b96a91e45fa 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -31,14 +31,15 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + # tests fail to compile + doCheck = false; + # doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "test"; - meta = { + meta = with stdenv.lib; { description = "Memory Efficient Serialization Library"; longDescription = '' FlatBuffers is an efficient cross platform serialization library for @@ -46,9 +47,9 @@ stdenv.mkDerivation rec { access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. ''; - maintainers = [ stdenv.lib.maintainers.teh ]; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.teh ]; + license = licenses.asl20; + platforms = platforms.unix; homepage = "https://google.github.io/flatbuffers/"; }; } From 692345a57070f2a03b59ac66b62872717b3b2d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 01:43:03 +0100 Subject: [PATCH 68/69] pythonPackages.google_cloud_bigquery: Cleanups --- .../google_cloud_bigquery/default.nix | 49 ++++++++++++------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 3255475fbf51..1ffc9e901899 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -1,6 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, freezegun -, google_api_core, google_cloud_core, google_cloud_testutils -, google_resumable_media, grpcio, ipython, mock, pandas, proto-plus, pyarrow }: +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, freezegun +, google_cloud_core +, google_cloud_testutils +, google_resumable_media +, grpcio +, ipython +, mock +, pandas +, proto-plus +, pyarrow +}: buildPythonPackage rec { pname = "google-cloud-bigquery"; @@ -8,40 +20,39 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1f99fd0c0c5bde999e056a1be666e5d5bbf392f62c9e730dfcbaf6e8408d44ef"; + sha256 = "1vs4im0fixmszh6p77icys9g7fymwmkfc6va0ng9kpjv1h6gv68z"; }; - disabled = pythonOlder "3.6"; - - checkInputs = - [ freezegun google_cloud_testutils ipython mock pytestCheckHook ]; propagatedBuildInputs = [ google_resumable_media - google_api_core google_cloud_core - pandas proto-plus pyarrow ]; + checkInputs = [ + freezegun + google_cloud_testutils + ipython + mock + pandas + pytestCheckHook + ]; + # prevent google directory from shadowing google imports - # test_magics requires modifying sys.path preCheck = '' rm -r google - rm tests/unit/test_magics.py ''; - # call_api_applying_custom_retry_on_timeout requires credentials - # to_dataframe_timestamp_out_of_pyarrow_bounds has inconsistent results - disabledTests = [ - "call_api_applying_custom_retry_on_timeout" - "to_dataframe_timestamp_out_of_pyarrow_bounds" + pythonImportsCheck = [ + "google.cloud.bigquery" + "google.cloud.bigquery_v2" ]; meta = with stdenv.lib; { description = "Google BigQuery API client library"; - homepage = "https://pypi.org/project/google-cloud-bigquery"; + homepage = "https://github.com/googleapis/python-bigquery"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From ac391fdc0bad04e7c83c53eb2ef527c8bc9d16cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 6 Jan 2021 10:46:48 +0100 Subject: [PATCH 69/69] pythonPackages:google*: Noramlize names by replacing _ with - --- .../version-management/dvc/default.nix | 2 +- .../python-modules/cirq/default.nix | 4 +- .../default.nix | 4 +- .../google-api-python-client/default.nix | 4 +- .../default.nix | 0 .../google-auth-httplib2/default.nix | 4 +- .../google-auth-oauthlib/default.nix | 4 +- .../{google_auth => google-auth}/default.nix | 0 .../default.nix | 4 +- .../default.nix | 20 ++--- .../default.nix | 12 +-- .../default.nix | 4 +- .../default.nix | 12 +-- .../default.nix | 6 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 10 +-- .../default.nix | 8 +- .../default.nix | 6 +- .../default.nix | 8 +- .../default.nix | 12 +-- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 10 +-- .../default.nix | 8 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 8 +- .../default.nix | 4 +- .../default.nix | 6 +- .../default.nix | 6 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 8 +- .../default.nix | 4 +- .../default.nix | 24 ++--- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 10 +-- .../default.nix | 10 +-- .../default.nix | 8 +- .../default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 0 .../default.nix | 10 +-- .../python-modules/gspread/default.nix | 4 +- .../python-modules/kubernetes/default.nix | 4 +- .../python-modules/labelbox/default.nix | 4 +- .../python-modules/protobuf/default.nix | 6 +- .../home-assistant/component-packages.nix | 4 +- pkgs/tools/backup/s3ql/default.nix | 2 +- pkgs/tools/backup/wal-e/default.nix | 2 +- pkgs/top-level/python-packages.nix | 88 +++++++++---------- 57 files changed, 209 insertions(+), 209 deletions(-) rename pkgs/development/python-modules/{google_api_core => google-api-core}/default.nix (97%) rename pkgs/development/python-modules/{google_apputils => google-apputils}/default.nix (100%) rename pkgs/development/python-modules/{google_auth => google-auth}/default.nix (100%) rename pkgs/development/python-modules/{google_cloud_access_context_manager => google-cloud-access-context-manager}/default.nix (84%) rename pkgs/development/python-modules/{google_cloud_asset => google-cloud-asset}/default.nix (74%) rename pkgs/development/python-modules/{google_cloud_automl => google-cloud-automl}/default.nix (84%) rename pkgs/development/python-modules/{google_cloud_bigquery_datatransfer => google-cloud-bigquery-datatransfer}/default.nix (90%) rename pkgs/development/python-modules/{google_cloud_bigquery => google-cloud-bigquery}/default.nix (86%) rename pkgs/development/python-modules/{google_cloud_bigtable => google-cloud-bigtable}/default.nix (84%) rename pkgs/development/python-modules/{google_cloud_container => google-cloud-container}/default.nix (91%) rename pkgs/development/python-modules/{google_cloud_core => google-cloud-core}/default.nix (92%) rename pkgs/development/python-modules/{google_cloud_dataproc => google-cloud-dataproc}/default.nix (91%) rename pkgs/development/python-modules/{google_cloud_datastore => google-cloud-datastore}/default.nix (81%) rename pkgs/development/python-modules/{google_cloud_dlp => google-cloud-dlp}/default.nix (81%) rename pkgs/development/python-modules/{google_cloud_dns => google-cloud-dns}/default.nix (87%) rename pkgs/development/python-modules/{google_cloud_error_reporting => google-cloud-error-reporting}/default.nix (82%) rename pkgs/development/python-modules/{google_cloud_firestore => google-cloud-firestore}/default.nix (89%) rename pkgs/development/python-modules/{google_cloud_iam => google-cloud-iam}/default.nix (90%) rename pkgs/development/python-modules/{google_cloud_iot => google-cloud-iot}/default.nix (90%) rename pkgs/development/python-modules/{google_cloud_kms => google-cloud-kms}/default.nix (91%) rename pkgs/development/python-modules/{google_cloud_language => google-cloud-language}/default.nix (90%) rename pkgs/development/python-modules/{google_cloud_logging => google-cloud-logging}/default.nix (87%) rename pkgs/development/python-modules/{google_cloud_monitoring => google-cloud-monitoring}/default.nix (82%) rename pkgs/development/python-modules/{google_cloud_org_policy => google-cloud-org-policy}/default.nix (83%) rename pkgs/development/python-modules/{google_cloud_os_config => google-cloud-os-config}/default.nix (84%) rename pkgs/development/python-modules/{google_cloud_pubsub => google-cloud-pubsub}/default.nix (83%) rename pkgs/development/python-modules/{google_cloud_redis => google-cloud-redis}/default.nix (90%) rename pkgs/development/python-modules/{google_cloud_resource_manager => google-cloud-resource-manager}/default.nix (88%) rename pkgs/development/python-modules/{google_cloud_runtimeconfig => google-cloud-runtimeconfig}/default.nix (88%) rename pkgs/development/python-modules/{google_cloud_secret_manager => google-cloud-secret-manager}/default.nix (95%) rename pkgs/development/python-modules/{google_cloud_securitycenter => google-cloud-securitycenter}/default.nix (91%) rename pkgs/development/python-modules/{google_cloud_spanner => google-cloud-spanner}/default.nix (87%) rename pkgs/development/python-modules/{google_cloud_speech => google-cloud-speech}/default.nix (91%) rename pkgs/development/python-modules/{google_cloud_storage => google-cloud-storage}/default.nix (80%) rename pkgs/development/python-modules/{google_cloud_tasks => google-cloud-tasks}/default.nix (91%) rename pkgs/development/python-modules/{google_cloud_testutils => google-cloud-testutils}/default.nix (83%) rename pkgs/development/python-modules/{google_cloud_texttospeech => google-cloud-texttospeech}/default.nix (91%) rename pkgs/development/python-modules/{google_cloud_trace => google-cloud-trace}/default.nix (80%) rename pkgs/development/python-modules/{google_cloud_translate => google-cloud-translate}/default.nix (81%) rename pkgs/development/python-modules/{google_cloud_videointelligence => google-cloud-videointelligence}/default.nix (85%) rename pkgs/development/python-modules/{google_cloud_vision => google-cloud-vision}/default.nix (91%) rename pkgs/development/python-modules/{google_cloud_websecurityscanner => google-cloud-websecurityscanner}/default.nix (90%) rename pkgs/development/python-modules/{google_crc32c => google-crc32c}/default.nix (100%) rename pkgs/development/python-modules/{google_resumable_media => google-resumable-media}/default.nix (83%) diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index b9ac8b139cbb..ac1659cccf8b 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { distro appdirs ] - ++ lib.optional enableGoogle google_cloud_storage + ++ lib.optional enableGoogle google-cloud-storage ++ lib.optional enableAWS boto3 ++ lib.optional enableAzure azure-storage-blob ++ lib.optional enableSSH paramiko; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 537ffdbaf958..ebc0eb51df43 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fetchpatch , freezegun -, google_api_core +, google-api-core , matplotlib , networkx , numpy @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ freezegun - google_api_core + google-api-core numpy matplotlib networkx diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix similarity index 97% rename from pkgs/development/python-modules/google_api_core/default.nix rename to pkgs/development/python-modules/google-api-core/default.nix index e2b5ae9d8983..6715590dc329 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, google_auth +, google-auth , googleapis_common_protos , grpcio , protobuf @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ googleapis_common_protos - google_auth + google-auth grpcio protobuf pytz diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index b14276b0a1a2..2f6508c062f7 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, google_auth, google-auth-httplib2, google_api_core +, google-auth, google-auth-httplib2, google-api-core , httplib2, six, uritemplate, oauth2client }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ - google_auth google-auth-httplib2 google_api_core + google-auth google-auth-httplib2 google-api-core httplib2 six uritemplate oauth2client ]; diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix similarity index 100% rename from pkgs/development/python-modules/google_apputils/default.nix rename to pkgs/development/python-modules/google-apputils/default.nix diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index 71abc249e7b2..bb7836ef85d1 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , flask -, google_auth +, google-auth , httplib2 , mock , pytestCheckHook @@ -20,7 +20,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - google_auth + google-auth httplib2 ]; diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 17a98d7814e4..7fa7200fbbe5 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -4,7 +4,7 @@ , click , mock , pytestCheckHook -, google_auth +, google-auth , requests_oauthlib }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - google_auth + google-auth requests_oauthlib ]; diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix similarity index 100% rename from pkgs/development/python-modules/google_auth/default.nix rename to pkgs/development/python-modules/google-auth/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 similarity index 84% rename from pkgs/development/python-modules/google_cloud_access_context_manager/default.nix rename to pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 82ba8a7fdcb4..3f614258a8fb 100644 --- a/pkgs/development/python-modules/google_cloud_access_context_manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b"; }; - propagatedBuildInputs = [ google_api_core ]; + propagatedBuildInputs = [ google-api-core ]; # No tests in repo doCheck = false; diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix similarity index 74% rename from pkgs/development/python-modules/google_cloud_asset/default.nix rename to pkgs/development/python-modules/google-cloud-asset/default.nix index 79a47bb5096f..d9baa821fa1e 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -2,11 +2,11 @@ , buildPythonPackage , fetchPypi , grpc_google_iam_v1 -, google_api_core -, google_cloud_access_context_manager -, google_cloud_org_policy -, google_cloud_os_config -, google_cloud_testutils +, google-api-core +, google-cloud-access-context-manager +, google-cloud-org-policy +, google-cloud-os-config +, google-cloud-testutils , libcst , proto-plus , pytest @@ -26,15 +26,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ grpc_google_iam_v1 - google_api_core - google_cloud_access_context_manager - google_cloud_org_policy - google_cloud_os_config + google-api-core + google-cloud-access-context-manager + google-cloud-org-policy + google-cloud-os-config libcst proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ]; + checkInputs = [ google-cloud-testutils mock pytest-asyncio pytestCheckHook ]; pythonImportsCheck = [ "google.cloud.asset" diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix similarity index 84% rename from pkgs/development/python-modules/google_cloud_automl/default.nix rename to pkgs/development/python-modules/google-cloud-automl/default.nix index 3352cbc8b1e1..ce2a9e116cd8 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -3,9 +3,9 @@ , fetchPypi , pytestCheckHook , libcst -, google_api_core -, google_cloud_storage -, google_cloud_testutils +, google-api-core +, google-cloud-storage +, google-cloud-testutils , pandas , proto-plus , pytest-asyncio @@ -21,11 +21,11 @@ buildPythonPackage rec { sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; checkInputs = [ - google_cloud_storage - google_cloud_testutils + google-cloud-storage + google-cloud-testutils mock pandas pytest-asyncio diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix similarity index 90% rename from pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix rename to pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 704ef499d74b..fde46ab7f12d 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , libcst , proto-plus , pytestCheckHook @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0hmsqvs2srmqcwmli48vd5vw829zax3pwj63fsxig6sdhjlf6j7j"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix similarity index 86% rename from pkgs/development/python-modules/google_cloud_bigquery/default.nix rename to pkgs/development/python-modules/google-cloud-bigquery/default.nix index 1ffc9e901899..7206ee43af31 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -3,9 +3,9 @@ , fetchPypi , pytestCheckHook , freezegun -, google_cloud_core -, google_cloud_testutils -, google_resumable_media +, google-cloud-core +, google-cloud-testutils +, google-resumable-media , grpcio , ipython , mock @@ -24,15 +24,15 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - google_resumable_media - google_cloud_core + google-resumable-media + google-cloud-core proto-plus pyarrow ]; checkInputs = [ freezegun - google_cloud_testutils + google-cloud-testutils ipython mock pandas diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix similarity index 84% rename from pkgs/development/python-modules/google_cloud_bigtable/default.nix rename to pkgs/development/python-modules/google-cloud-bigtable/default.nix index bd12aa592d50..032a30bb2423 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , grpc_google_iam_v1 -, google_api_core -, google_cloud_core +, google-api-core +, google-cloud-core , pytest , mock }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core google_cloud_core ]; + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core google-cloud-core ]; checkPhase = '' rm -r google diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix similarity index 91% rename from pkgs/development/python-modules/google_cloud_container/default.nix rename to pkgs/development/python-modules/google-cloud-container/default.nix index 69c142171ad6..011bb7b1967e 100644 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , grpc_google_iam_v1 , libcst , mock @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "04f9mx1wxy3l9dvzvvr579fnjp1fdqhgplv5y2gl7h2mvn281k8d"; }; - propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix similarity index 92% rename from pkgs/development/python-modules/google_cloud_core/default.nix rename to pkgs/development/python-modules/google-cloud-core/default.nix index bcb9504cb919..c22c56a1ba49 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -4,7 +4,7 @@ , pythonOlder , pytestCheckHook , python -, google_api_core +, google-api-core , grpcio , mock }: @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "01liq4nrd2g3ingg8v0ly4c86db8agnr9h1fiz219c7fz0as0xqj"; }; - propagatedBuildInputs = [ google_api_core ]; + propagatedBuildInputs = [ google-api-core ]; checkInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix similarity index 91% rename from pkgs/development/python-modules/google_cloud_dataproc/default.nix rename to pkgs/development/python-modules/google-cloud-dataproc/default.nix index 5b4d4f255299..f99b2c382fc6 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , mock , libcst , proto-plus @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "07rv2kgbaqkbd71k5i2zn9kcxasfzkkyai8jnbszhkf92k0lmi41"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix similarity index 81% rename from pkgs/development/python-modules/google_cloud_datastore/default.nix rename to pkgs/development/python-modules/google-cloud-datastore/default.nix index 9ce64fcfd585..5daa2cdd81eb 100644 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -1,14 +1,14 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core -, google_cloud_core +, google-api-core +, google-cloud-core , libcst , proto-plus , mock , pytestCheckHook , pytest-asyncio -, google_cloud_testutils +, google-cloud-testutils }: buildPythonPackage rec { @@ -20,9 +20,9 @@ buildPythonPackage rec { sha256 = "1yyk9ix1jms5q4kk76cfxzy42wzzyl5qladdswjy5l0pg6iypr8i"; }; - propagatedBuildInputs = [ google_api_core google_cloud_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' # directory shadows imports diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix similarity index 81% rename from pkgs/development/python-modules/google_cloud_dlp/default.nix rename to pkgs/development/python-modules/google-cloud-dlp/default.nix index 1e89a60a6502..e02805c40762 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -1,8 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core -, google_cloud_testutils +, google-api-core +, google-cloud-testutils , libcst , proto-plus , pytestCheckHook @@ -19,9 +19,9 @@ buildPythonPackage rec { sha256 = "09rnzpdlycr1wv8agcfx05v1prn35ylphsbr07486zqdkh5wjk8p"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix similarity index 87% rename from pkgs/development/python-modules/google_cloud_dns/default.nix rename to pkgs/development/python-modules/google-cloud-dns/default.nix index 7cccad0e6c5d..b6777fccec02 100644 --- a/pkgs/development/python-modules/google_cloud_dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -1,8 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core -, google_cloud_core +, google-api-core +, google-cloud-core , pytestCheckHook , mock }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "01l6pvfic0vxcvd97ckbxyc7ccr9vb9ln4lyhpp3amdmcy0far3j"; }; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + propagatedBuildInputs = [ google-api-core google-cloud-core ]; checkInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix similarity index 82% rename from pkgs/development/python-modules/google_cloud_error_reporting/default.nix rename to pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 196ec4a912b7..cdd54a291243 100644 --- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, google_cloud_logging -, google_cloud_testutils +, google-cloud-logging +, google-cloud-testutils , libcst , mock , proto-plus @@ -19,9 +19,9 @@ buildPythonPackage rec { sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4"; }; - propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ]; + propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; disabledTests = [ # require credentials diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix similarity index 89% rename from pkgs/development/python-modules/google_cloud_firestore/default.nix rename to pkgs/development/python-modules/google-cloud-firestore/default.nix index b69f9e75d9a2..1de3ea11b37d 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -2,9 +2,9 @@ , buildPythonPackage , fetchPypi , aiounittest -, google_api_core -, google_cloud_testutils -, google_cloud_core +, google-api-core +, google-cloud-testutils +, google-cloud-core , mock , proto-plus , pytestCheckHook @@ -21,14 +21,14 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - google_api_core - google_cloud_core + google-api-core + google-cloud-core proto-plus ]; checkInputs = [ aiounittest - google_cloud_testutils + google-cloud-testutils mock pytestCheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/google_cloud_iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix similarity index 90% rename from pkgs/development/python-modules/google_cloud_iam/default.nix rename to pkgs/development/python-modules/google-cloud-iam/default.nix index 3f7224f6c806..f96940f4e67f 100644 --- a/pkgs/development/python-modules/google_cloud_iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , pythonOlder -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix similarity index 90% rename from pkgs/development/python-modules/google_cloud_iot/default.nix rename to pkgs/development/python-modules/google-cloud-iot/default.nix index d5b9cbf127ec..7e8a224256d1 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , grpc_google_iam_v1 -, google_api_core +, google-api-core , libcst , proto-plus , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "08spn5g0s386x21dgwb46na8aknbwq5d1sn8bh6kayk9fjfbxwla"; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix similarity index 91% rename from pkgs/development/python-modules/google_cloud_kms/default.nix rename to pkgs/development/python-modules/google-cloud-kms/default.nix index 0000e39685c2..49f088478ee0 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , grpc_google_iam_v1 -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga"; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix similarity index 90% rename from pkgs/development/python-modules/google_cloud_language/default.nix rename to pkgs/development/python-modules/google-cloud-language/default.nix index 585ea5ef973f..2074b1edb1d6 100644 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "123vqfrn7pyn3ia7cmhx8bgafd4gxxlmhf33s3vgspyjck6sprxb"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix similarity index 87% rename from pkgs/development/python-modules/google_cloud_logging/default.nix rename to pkgs/development/python-modules/google-cloud-logging/default.nix index ec187f82f7bf..dba00274021f 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -3,9 +3,9 @@ , fetchPypi , django , flask -, google_api_core -, google_cloud_core -, google_cloud_testutils +, google-api-core +, google-cloud-core +, google-cloud-testutils , mock , proto-plus , pytestCheckHook @@ -22,12 +22,12 @@ buildPythonPackage rec { sha256 = "0s09vs4rnq4637j8zw7grv3f4j7njqprm744b1knzldj91rg0vmi"; }; - propagatedBuildInputs = [ google_api_core google_cloud_core proto-plus ]; + propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; checkInputs = [ django flask - google_cloud_testutils + google-cloud-testutils mock pytestCheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix similarity index 82% rename from pkgs/development/python-modules/google_cloud_monitoring/default.nix rename to pkgs/development/python-modules/google-cloud-monitoring/default.nix index c1890d99a040..10d7264c5606 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -1,8 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core -, google_cloud_testutils +, google-api-core +, google-cloud-testutils , libcst , proto-plus , pytestCheckHook @@ -19,9 +19,9 @@ buildPythonPackage rec { sha256 = "07r0y995fin6cbnqlhmd38fv3pfhhqyw04l7nr38sldrd82gmsqx"; }; - propagatedBuildInputs = [ libcst google_api_core proto-plus ]; + propagatedBuildInputs = [ libcst google-api-core proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google_cloud_org_policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix similarity index 83% rename from pkgs/development/python-modules/google_cloud_org_policy/default.nix rename to pkgs/development/python-modules/google-cloud-org-policy/default.nix index 033706fa4ffd..10ee559b8f0b 100644 --- a/pkgs/development/python-modules/google_cloud_org_policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }: buildPythonPackage rec { pname = "google-cloud-org-policy"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh"; }; - propagatedBuildInputs = [ google_api_core ]; + propagatedBuildInputs = [ google-api-core ]; # No tests in repo doCheck = false; diff --git a/pkgs/development/python-modules/google_cloud_os_config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix similarity index 84% rename from pkgs/development/python-modules/google_cloud_os_config/default.nix rename to pkgs/development/python-modules/google-cloud-os-config/default.nix index 20e651a54ca3..94d8d4738f5c 100644 --- a/pkgs/development/python-modules/google_cloud_os_config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, google_api_core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }: +{ lib, buildPythonPackage, fetchPypi, google-api-core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-os-config"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "07zvagy9hwaccwvg1xad5nkalgkria0maa5yxiwqf1yk9f7gbyq1"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix similarity index 83% rename from pkgs/development/python-modules/google_cloud_pubsub/default.nix rename to pkgs/development/python-modules/google-cloud-pubsub/default.nix index 4c6e08c91f5d..e946f74ed3b2 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, google_api_core -, google_cloud_testutils +, google-api-core +, google-cloud-testutils , grpc_google_iam_v1 , libcst , mock @@ -20,9 +20,9 @@ buildPythonPackage rec { sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w"; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' # prevent google directory from shadowing google imports diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix similarity index 90% rename from pkgs/development/python-modules/google_cloud_redis/default.nix rename to pkgs/development/python-modules/google-cloud-redis/default.nix index 734f7650b316..9408c6642d96 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1f67mr473vzv0qgjm4hycfnrjgiqrsv47vqrynwjy9yrca2130y7"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix similarity index 88% rename from pkgs/development/python-modules/google_cloud_resource_manager/default.nix rename to pkgs/development/python-modules/google-cloud-resource-manager/default.nix index e8c47cc77596..36e8d0bcc52b 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, google_cloud_core -, google_api_core +, google-cloud-core +, google-api-core , mock }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1la643vkf6fm2gapz57cm92xzvmhzgpzv3bb6112yz1cizrvnxrm"; }; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + propagatedBuildInputs = [ google-api-core google-cloud-core ]; checkInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix similarity index 88% rename from pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix rename to pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 4269943d08ea..c4e569b88ad3 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -1,8 +1,8 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core -, google_cloud_core +, google-api-core +, google-cloud-core , mock , pytestCheckHook }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1bd8hlp0ssi20ds4gknbxai8mih6xiz8b60ab7p0ngpdqp1kw52p"; }; - propagatedBuildInputs = [ google_api_core google_cloud_core ]; + propagatedBuildInputs = [ google-api-core google-cloud-core ]; checkInputs = [ mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix similarity index 95% rename from pkgs/development/python-modules/google_cloud_secret_manager/default.nix rename to pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 8b84b55c93ec..bb18b72caad6 100644 --- a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , grpc_google_iam_v1 , libcst , mock @@ -20,7 +20,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - google_api_core + google-api-core grpc_google_iam_v1 libcst proto-plus diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix similarity index 91% rename from pkgs/development/python-modules/google_cloud_securitycenter/default.nix rename to pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 73f481abd27a..4784dbe44739 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , grpc_google_iam_v1 -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1lgz6qpsfv4b7p5ff4sdpjpaddxpbazdvlcrqr1i0c0qil2lkm2i"; }; - propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix similarity index 87% rename from pkgs/development/python-modules/google_cloud_spanner/default.nix rename to pkgs/development/python-modules/google-cloud-spanner/default.nix index 3d34f22f3c14..2591fd9dc689 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , grpc_google_iam_v1 -, google_cloud_core -, google_cloud_testutils +, google-cloud-core +, google-cloud-testutils , libcst , mock , proto-plus @@ -26,9 +26,9 @@ buildPythonPackage rec { --replace '"proto-plus == 1.11.0"' '"proto-plus"' ''; - propagatedBuildInputs = [ google_cloud_core grpc_google_iam_v1 libcst proto-plus sqlparse ]; + propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' # prevent google directory from shadowing google imports diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix similarity index 91% rename from pkgs/development/python-modules/google_cloud_speech/default.nix rename to pkgs/development/python-modules/google-cloud-speech/default.nix index a47298acc335..a1d6762eafbf 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0ch85h5xrb15fcml5v0f30s0niw02k4v8gi7i8a40161yj882hm7"; }; - propagatedBuildInputs = [ libcst google_api_core proto-plus ]; + propagatedBuildInputs = [ libcst google-api-core proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix similarity index 80% rename from pkgs/development/python-modules/google_cloud_storage/default.nix rename to pkgs/development/python-modules/google-cloud-storage/default.nix index 6bb734c98762..cf869d5c8eff 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -2,12 +2,12 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, google_auth -, google_cloud_iam -, google_cloud_core -, google_cloud_kms -, google_cloud_testutils -, google_resumable_media +, google-auth +, google-cloud-iam +, google-cloud-core +, google-cloud-kms +, google-cloud-testutils +, google-resumable-media , mock }: @@ -21,15 +21,15 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - google_auth - google_cloud_core - google_resumable_media + google-auth + google-cloud-core + google-resumable-media ]; checkInputs = [ - google_cloud_iam - google_cloud_kms - google_cloud_testutils + google-cloud-iam + google-cloud-kms + google-cloud-testutils mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix similarity index 91% rename from pkgs/development/python-modules/google_cloud_tasks/default.nix rename to pkgs/development/python-modules/google-cloud-tasks/default.nix index 28aa98c94915..8f86e71daedc 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , grpc_google_iam_v1 , libcst , mock @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1jsf7y88lvln9r08pmx673ibmgw397qmir5drrcfvlmgqvszp7qx"; }; - propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix similarity index 83% rename from pkgs/development/python-modules/google_cloud_testutils/default.nix rename to pkgs/development/python-modules/google-cloud-testutils/default.nix index cf1535e7130e..7358c61f59a0 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, google_auth, six }: +{ stdenv, buildPythonPackage, fetchPypi, google-auth, six }: buildPythonPackage rec { pname = "google-cloud-testutils"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k"; }; - propagatedBuildInputs = [ google_auth six ]; + propagatedBuildInputs = [ google-auth six ]; # does not contain tests doCheck = false; diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix similarity index 91% rename from pkgs/development/python-modules/google_cloud_texttospeech/default.nix rename to pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 6b145bfd3f82..7c8f738f57b7 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "17igfwh34369gkvsbrm46j1ii61i6268wg2g2dl9c65nf9z3kgfb"; }; - propagatedBuildInputs = [ libcst google_api_core proto-plus ]; + propagatedBuildInputs = [ libcst google-api-core proto-plus ]; checkInputs = [ mock pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix similarity index 80% rename from pkgs/development/python-modules/google_cloud_trace/default.nix rename to pkgs/development/python-modules/google-cloud-trace/default.nix index 50a2693f8b51..200f3dc1816a 100644 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -1,9 +1,9 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core -, google_cloud_core -, google_cloud_testutils +, google-api-core +, google-cloud-core +, google-cloud-testutils , mock , proto-plus , pytestCheckHook @@ -19,9 +19,9 @@ buildPythonPackage rec { sha256 = "1lvcm4w1l7hiqg64kdscch3f3bq19q9ii49xj4lljn2a4xffxl8v"; }; - propagatedBuildInputs = [ google_api_core google_cloud_core proto-plus ]; + propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; disabledTests = [ # require credentials diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix similarity index 81% rename from pkgs/development/python-modules/google_cloud_translate/default.nix rename to pkgs/development/python-modules/google-cloud-translate/default.nix index f95ac1742d42..41ec5e76fece 100644 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -2,9 +2,9 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, google_api_core -, google_cloud_core -, google_cloud_testutils +, google-api-core +, google-cloud-core +, google-cloud-testutils , grpcio , libcst , mock @@ -21,9 +21,9 @@ buildPythonPackage rec { sha256 = "1s2gvlzfqd2gsrzaz7yl9q8s1k03dlsjahgg95s017vlcn21d0v1"; }; - propagatedBuildInputs = [ google_api_core google_cloud_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' # prevent shadowing imports diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix similarity index 85% rename from pkgs/development/python-modules/google_cloud_videointelligence/default.nix rename to pkgs/development/python-modules/google-cloud-videointelligence/default.nix index d052b1dcf084..72a7f42e4f59 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , mock -, google_api_core -, google_cloud_testutils +, google-api-core +, google-cloud-testutils , proto-plus , pytestCheckHook , pytest-asyncio @@ -18,9 +18,9 @@ buildPythonPackage rec { sha256 = "1yhmizig41ymr2dz0i6ccrwszp0ivyykmq11vqxp82l9ncjima82"; }; - propagatedBuildInputs = [ google_api_core proto-plus ]; + propagatedBuildInputs = [ google-api-core proto-plus ]; - checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; disabledTests = [ # require credentials diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix similarity index 91% rename from pkgs/development/python-modules/google_cloud_vision/default.nix rename to pkgs/development/python-modules/google-cloud-vision/default.nix index 801af638d275..42e0aa61f747 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka"; }; - propagatedBuildInputs = [ libcst google_api_core proto-plus]; + propagatedBuildInputs = [ libcst google-api-core proto-plus]; checkInputs = [ mock pytestCheckHook pytest-asyncio ]; diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix similarity index 90% rename from pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix rename to pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index a8f2741d07de..c145bf9837d0 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, google_api_core +, google-api-core , libcst , mock , proto-plus @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "14sky9bkl00n65ksig3f6psm31pkmkvlcprlk6s9if470j40zrhx"; }; - propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus ]; checkInputs = [ mock pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/google_crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix similarity index 100% rename from pkgs/development/python-modules/google_crc32c/default.nix rename to pkgs/development/python-modules/google-crc32c/default.nix diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix similarity index 83% rename from pkgs/development/python-modules/google_resumable_media/default.nix rename to pkgs/development/python-modules/google-resumable-media/default.nix index 4036613e3e25..531dc1a28603 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -1,9 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, google_auth -, google_cloud_testutils -, google_crc32c +, google-auth +, google-cloud-testutils +, google-crc32c , mock , pytestCheckHook , pytest-asyncio @@ -19,9 +19,9 @@ buildPythonPackage rec { sha256 = "0hwxdgsqh6933kp4jkv6hwwdcqs7bgjn9j08ga399njv3s9b367f"; }; - propagatedBuildInputs = [ google_auth google_crc32c requests ]; + propagatedBuildInputs = [ google-auth google-crc32c requests ]; - checkInputs = [ google_auth google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' # prevent shadowing imports diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 5fd73541dd42..9ad1d0c685dc 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, google_auth +, google-auth , google-auth-oauthlib }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c"; }; - propagatedBuildInputs = [ requests google_auth google-auth-oauthlib ]; + propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; meta = with stdenv.lib; { description = "Google Spreadsheets client library"; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 2679c81de0f0..0be1ae0353f8 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, - ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal, + ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ]; + propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; meta = with stdenv.lib; { description = "Kubernetes python client"; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 0556411ee47e..08c5c3343084 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -8,7 +8,7 @@ , shapely , ndjson , backoff -, google_api_core +, google-api-core }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ndjson backoff - google_api_core + google-api-core ]; # Test cases are not running on pypi or GitHub diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 595bab6cfa35..4925c3dfd02f 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -5,7 +5,7 @@ , buildPythonPackage , isPy37 , protobuf -, google_apputils +, google-apputils , six , pyext , libcxx @@ -29,9 +29,9 @@ buildPythonPackage { outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google_apputils ]; + propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google-apputils ]; propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. - nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google_apputils ]; + nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google-apputils ]; buildInputs = [ protobuf ]; patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2")) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6df1239537eb..ea7b12983900 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -310,10 +310,10 @@ "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; - "google_cloud" = ps: with ps; [ google_cloud_texttospeech ]; + "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib - "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; + "google_pubsub" = ps: with ps; [ google-cloud-pubsub ]; "google_translate" = ps: with ps; [ gtts ]; "google_travel_time" = ps: with ps; [ googlemaps ]; "google_wifi" = ps: with ps; [ ]; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 346f8d279646..7e4cc66278cb 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); propagatedBuildInputs = with python3Packages; [ sqlite apsw pycrypto requests defusedxml dugong llfuse - cython pytest pytest-catchlog google_auth google-auth-oauthlib + cython pytest pytest-catchlog google-auth google-auth-oauthlib ]; preBuild = '' diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index a6d5b6b48010..b3e9bfd56c0f 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = (with python3Packages; [ boto gevent - google_cloud_storage + google-cloud-storage ]) ++ [ postgresql lzop diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb03ae13bf65..7af345b902b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2500,7 +2500,7 @@ in { goocalendar = callPackage ../development/python-modules/goocalendar { }; - google_api_core = callPackage ../development/python-modules/google_api_core { }; + google-api-core = callPackage ../development/python-modules/google-api-core { }; google_api_python_client = let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; @@ -2517,95 +2517,95 @@ in { googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; - google_apputils = callPackage ../development/python-modules/google_apputils { }; + google-apputils = callPackage ../development/python-modules/google-apputils { }; - google_auth = callPackage ../development/python-modules/google_auth { }; + google-auth = callPackage ../development/python-modules/google-auth { }; google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; 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-access-context-manager = callPackage ../development/python-modules/google-cloud-access-context-manager { }; - google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; + google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; - google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; + google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { }; - google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { }; + google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { }; - google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { }; + google-cloud-bigquery-datatransfer = callPackage ../development/python-modules/google-cloud-bigquery-datatransfer { }; - google_cloud_bigtable = callPackage ../development/python-modules/google_cloud_bigtable { }; + google-cloud-bigtable = callPackage ../development/python-modules/google-cloud-bigtable { }; - google_cloud_container = callPackage ../development/python-modules/google_cloud_container { }; + google-cloud-container = callPackage ../development/python-modules/google-cloud-container { }; - google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + google-cloud-core = callPackage ../development/python-modules/google-cloud-core { }; - google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { }; + google-cloud-dataproc = callPackage ../development/python-modules/google-cloud-dataproc { }; - google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { }; + google-cloud-datastore = callPackage ../development/python-modules/google-cloud-datastore { }; - google_cloud_dlp = callPackage ../development/python-modules/google_cloud_dlp { }; + google-cloud-dlp = callPackage ../development/python-modules/google-cloud-dlp { }; - google_cloud_dns = callPackage ../development/python-modules/google_cloud_dns { }; + google-cloud-dns = callPackage ../development/python-modules/google-cloud-dns { }; - google_cloud_error_reporting = callPackage ../development/python-modules/google_cloud_error_reporting { }; + google-cloud-error-reporting = callPackage ../development/python-modules/google-cloud-error-reporting { }; - google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; + google-cloud-firestore = callPackage ../development/python-modules/google-cloud-firestore { }; - google_cloud_iam = callPackage ../development/python-modules/google_cloud_iam { }; + google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { }; - google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; + google-cloud-iot = callPackage ../development/python-modules/google-cloud-iot { }; - google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { }; + google-cloud-kms = callPackage ../development/python-modules/google-cloud-kms { }; - google_cloud_language = callPackage ../development/python-modules/google_cloud_language { }; + google-cloud-language = callPackage ../development/python-modules/google-cloud-language { }; - google_cloud_logging = callPackage ../development/python-modules/google_cloud_logging { }; + google-cloud-logging = callPackage ../development/python-modules/google-cloud-logging { }; - google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { }; + google-cloud-monitoring = callPackage ../development/python-modules/google-cloud-monitoring { }; - google_cloud_org_policy = callPackage ../development/python-modules/google_cloud_org_policy { }; + google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { }; - google_cloud_os_config = callPackage ../development/python-modules/google_cloud_os_config { }; + google-cloud-os-config = callPackage ../development/python-modules/google-cloud-os-config { }; - google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; + google-cloud-pubsub = callPackage ../development/python-modules/google-cloud-pubsub { }; - google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { }; + google-cloud-redis = callPackage ../development/python-modules/google-cloud-redis { }; - google_cloud_resource_manager = callPackage ../development/python-modules/google_cloud_resource_manager { }; + google-cloud-resource-manager = callPackage ../development/python-modules/google-cloud-resource-manager { }; - google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { }; + google-cloud-runtimeconfig = callPackage ../development/python-modules/google-cloud-runtimeconfig { }; - google_cloud_secret_manager = callPackage ../development/python-modules/google_cloud_secret_manager { }; + google-cloud-secret-manager = callPackage ../development/python-modules/google-cloud-secret-manager { }; - google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { }; + google-cloud-securitycenter = callPackage ../development/python-modules/google-cloud-securitycenter { }; - google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; + google-cloud-spanner = callPackage ../development/python-modules/google-cloud-spanner { }; - google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + google-cloud-speech = callPackage ../development/python-modules/google-cloud-speech { }; - google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; + google-cloud-storage = callPackage ../development/python-modules/google-cloud-storage { }; - google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { }; + google-cloud-tasks = callPackage ../development/python-modules/google-cloud-tasks { }; - google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { }; + google-cloud-testutils = callPackage ../development/python-modules/google-cloud-testutils { }; - google_cloud_texttospeech = callPackage ../development/python-modules/google_cloud_texttospeech { }; + google-cloud-texttospeech = callPackage ../development/python-modules/google-cloud-texttospeech { }; - google_cloud_trace = callPackage ../development/python-modules/google_cloud_trace { }; + google-cloud-trace = callPackage ../development/python-modules/google-cloud-trace { }; - google_cloud_translate = callPackage ../development/python-modules/google_cloud_translate { }; + google-cloud-translate = callPackage ../development/python-modules/google-cloud-translate { }; - google_cloud_videointelligence = callPackage ../development/python-modules/google_cloud_videointelligence { }; + google-cloud-videointelligence = callPackage ../development/python-modules/google-cloud-videointelligence { }; - google_cloud_vision = callPackage ../development/python-modules/google_cloud_vision { }; + google-cloud-vision = callPackage ../development/python-modules/google-cloud-vision { }; - google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; + google-cloud-websecurityscanner = callPackage ../development/python-modules/google-cloud-websecurityscanner { }; google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - google_crc32c = callPackage ../development/python-modules/google_crc32c { + google-crc32c = callPackage ../development/python-modules/google-crc32c { inherit (pkgs) crc32c; }; @@ -2621,7 +2621,7 @@ in { google-pasta = callPackage ../development/python-modules/google-pasta { }; - google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; + google-resumable-media = callPackage ../development/python-modules/google-resumable-media { }; googletrans = callPackage ../development/python-modules/googletrans { };