From f8d1f6758fd348db8ce251ce6a696071d90de857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:01:07 +0200 Subject: [PATCH 01/14] python39Packages.google-api-core: 1.30.0 -> 2.0.0 --- .../python-modules/google-api-core/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 653786ace63f..e53346510dec 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -5,7 +5,7 @@ , googleapis-common-protos , grpcio , protobuf -, pytz +, proto-plus , requests , mock , pytest @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.30.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0724d354d394b3d763bc10dfee05807813c5210f0bd9b8e2ddf6b6925603411c"; + sha256 = "sha256-vZ6wcJ9OEN1v3bMv0HiKGQtDRCbCWL5uAO9A2hNtdo0="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { google-auth grpcio protobuf - pytz + proto-plus requests ]; @@ -47,8 +47,7 @@ buildPythonPackage rec { helpers used by all Google API clients. ''; homepage = "https://github.com/googleapis/python-api-core"; - changelog = - "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 6239f1cf817ec8abca97bf671b7aeae8370fbf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:03:42 +0200 Subject: [PATCH 02/14] python39Packages.google-auth: 1.34.0 -> 2.0.1 --- pkgs/development/python-modules/google-auth/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index bfca445a961f..c10e3807f200 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -14,24 +14,22 @@ , pytest-localserver , responses , rsa -, six , pyopenssl }: buildPythonPackage rec { pname = "google-auth"; - version = "1.34.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8QlAiLrgRvsG89Gj198UcX6NlZ6RBbecV3Jb1OF1l6I="; + sha256 = "sha256-6hrwULPgbrc+RHD3BNIwBzB7wOh8E+AV9rkEYPFAe9M="; }; propagatedBuildInputs = [ cachetools pyasn1-modules rsa - six pyopenssl pyu2f ]; From d13745ec9b2b5795bc0b427c8e12015851a53c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:05:49 +0200 Subject: [PATCH 03/14] python39Packages.google-cloud-bigquery: 2.23.3 -> 2.24.1 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0bd663b4f151..f30fa659720c 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.23.3"; + version = "2.24.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FQXtRM7YaU+S+Jqkn9dTQqJR3A1hL/XQjgPTXmANO0I="; + sha256 = "sha256-gRHSPir4epbAZGqCqD9i1pS2yIKeeIHrTkN7dURxZJ8="; }; propagatedBuildInputs = [ From fcb5dabb174f9ad13a9611ca2ae13128459e5438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:07:59 +0200 Subject: [PATCH 04/14] python39Packages.google-cloud-core: 1.7.2 -> 2.0.0 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index b9edb4224d8c..a51ed3840207 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.7.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sQMKrcuyrrTuUUdUJjUa+DwQckVrkY+4/bgGZsS7Y7U="; + sha256 = "sha256-kO6ZZIzPnhGhZ4Gn/FjRPlj2YrQ5xzfUjCTvGGYsJwI="; }; propagatedBuildInputs = [ google-api-core ]; From 0683b38c384601220dd438e2c2d9b32779e0c495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:13:08 +0200 Subject: [PATCH 05/14] python39Packages.google-cloud-spanner: 3.7.0 -> 3.8.0 --- .../python-modules/google-cloud-spanner/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 5f03a181183b..c6e1021f3430 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4LGSB7KU+RGvjSQ/w1vXxa5fkfFT4C5omhk/LnGSUng="; + sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ="; }; propagatedBuildInputs = [ @@ -43,8 +43,13 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires credentials - "tests/system/test_system.py" - "tests/system/test_system_dbapi.py" + "tests/system/test_backup_api.py" + "tests/system/test_database_api.py" + "tests/system/test_dbapi.py" + "tests/system/test_instance_api.py" + "tests/system/test_session_api.py" + "tests/system/test_streaming_chunking.py" + "tests/system/test_table_api.py" "tests/unit/spanner_dbapi/test_connect.py" "tests/unit/spanner_dbapi/test_connection.py" "tests/unit/spanner_dbapi/test_cursor.py" From 3f9ad23520bc1aa384ee6af656632d42de3bba16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:14:53 +0200 Subject: [PATCH 06/14] python39Packages.google-resumable-media: 1.3.3 -> 2.0.0 --- .../python-modules/google-resumable-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 83b192522f37..c76cd53a8296 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.3.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zjhVXSUL1wsMJZi/YemQA8uMVpsBduwOPzi4b5//9YE="; + sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; From 435a9dc3e4981ae86e303d9e52aaafe57a05a33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 22:28:55 +0200 Subject: [PATCH 07/14] python39Packages.google-cloud-access-context-manager: fix depedency pin --- .../google-cloud-access-context-manager/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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 index 470ec41f8365..7b33ee56caf4 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,6 +9,11 @@ buildPythonPackage rec { sha256 = "011hbbjqjqk6fskb180hfhhsddz3i2a9gz34sf4wy1j2s4my9xy0"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "google-api-core[grpc] >= 1.26.0, < 2.0.0dev" "google-api-core[grpc] >= 1.26.0, < 2.0.1" + ''; + propagatedBuildInputs = [ google-api-core ]; # No tests in repo From 0d51339e962e3304460e87ad700436e3cb23215f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 23:29:11 +0200 Subject: [PATCH 08/14] python39Packages.google-cloud-bigquery: disable tests which require credentials --- .../python-modules/google-cloud-bigquery/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index f30fa659720c..21d356f7f7c9 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -53,6 +53,12 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + "test_query_retry_539" + "test_query_retry_539" + "test_list_rows_empty_table" + "test_list_rows_page_size" + "test_list_rows_scalars" + "test_list_rows_scalars_extreme" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" # requires network From e24194df1c346684cee39821c6a399f01a6dc1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 10:16:33 +0200 Subject: [PATCH 09/14] python39Packages.google-cloud-firestore: 2.2.0 -> 2.3.0 --- .../python-modules/google-cloud-firestore/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 87bd997ae88f..8c4b964b2b83 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QMwvMPebC2a09XmKQKYFPwVIbZlnUEaXxTh8hlnS9Js="; + sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8="; }; propagatedBuildInputs = [ @@ -43,6 +43,8 @@ buildPythonPackage rec { # Tests are broken "tests/system/test_system.py" "tests/system/test_system_async.py" + # requires credentials + "tests/unit/v1/test_bulk_writer.py" ]; disabledTests = [ From 5dacb8308526107f031fc04a7981b5b3de68e916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 12:58:47 +0200 Subject: [PATCH 10/14] python39Packages.google-cloud-audit-log: init at 0.1.0 --- .../google-cloud-audit-log/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-audit-log/default.nix diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix new file mode 100644 index 000000000000..7d101c32284e --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, googleapis-common-protos, protobuf }: + +buildPythonPackage rec { + pname = "google-cloud-audit-log"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5bf5a53c641b13828154ab21fb209669be69d71cd462f5d6456bf87722fc0eeb"; + }; + + propagatedBuildInputs = [ googleapis-common-protos protobuf ]; + + # tests are a bit wonky to setup and are not very deep either + doCheck = false; + + pythonImportsCheck = [ "google.cloud.audit" ]; + + meta = with lib; { + description = "Google Cloud Audit Protos"; + homepage = "https://github.com/googleapis/python-audit-log"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..bc0389c3fcd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2995,6 +2995,8 @@ in { google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; + google-cloud-audit-log = callPackage ../development/python-modules/google-cloud-audit-log { }; + google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { }; google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { }; From 57988a92b3cf676a97b2b8943ca4c76cecc091ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 12:59:37 +0200 Subject: [PATCH 11/14] python39Packages.google-cloud-logging: fix missing imports --- .../python-modules/google-cloud-logging/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 00abd8160690..f9017eb33fa4 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -4,6 +4,8 @@ , django , flask , google-api-core +, google-cloud-appengine-logging +, google-cloud-audit-log , google-cloud-core , google-cloud-testutils , mock @@ -22,7 +24,13 @@ buildPythonPackage rec { sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-appengine-logging + google-cloud-audit-log + google-cloud-core + proto-plus + ]; checkInputs = [ django From 9084979fc34c662707086469c4be6f820dce93a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 21:39:11 +0200 Subject: [PATCH 12/14] python39Packages.tensorflow-tensorboard: 2.4.0 -> 2.6.0 --- .../tensorflow-tensorboard/default.nix | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 031254205066..123c339fea48 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , numpy , wheel , werkzeug @@ -7,6 +10,8 @@ , markdown , absl-py , google-auth-oauthlib +, setuptools +, tensorboard-data-server , tensorboard-plugin-wit , tensorboard-plugin-profile }: @@ -17,27 +22,44 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "2.4.0"; + version = "2.6.0"; format = "wheel"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "tensorboard"; inherit version format; + dist = "py3"; python = "py3"; - sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d"; + sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s="; }; + postPatch = '' + chmod u+rwx -R ./dist + pushd dist + wheel unpack --dest unpacked ./*.whl + pushd unpacked/tensorboard-${version} + + substituteInPlace tensorboard-${version}.dist-info/METADATA \ + --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" + + popd + wheel pack ./unpacked/tensorboard-${version} + popd + ''; + propagatedBuildInputs = [ - numpy - werkzeug - protobuf - markdown - grpcio absl-py + grpcio google-auth-oauthlib + markdown + numpy + protobuf + setuptools + tensorboard-data-server tensorboard-plugin-profile tensorboard-plugin-wit + werkzeug # not declared in install_requires, but used at runtime # https://github.com/NixOS/nixpkgs/issues/73840 wheel @@ -60,7 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "TensorFlow's Visualization Toolkit"; - homepage = "http://tensorflow.org"; + homepage = "https://www.tensorflow.org/"; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; }; From 3b7677852aab327a56b4e050915ddefbbe262a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 21:39:57 +0200 Subject: [PATCH 13/14] python39Packages.tesnorboard-data-server: init at 0.6.1 --- .../tensorboard-data-server/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/tensorboard-data-server/default.nix diff --git a/pkgs/development/python-modules/tensorboard-data-server/default.nix b/pkgs/development/python-modules/tensorboard-data-server/default.nix new file mode 100644 index 000000000000..74f53d7c6763 --- /dev/null +++ b/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "tensorboard-data-server"; + version = "0.6.1"; + format = "wheel"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "tensorboard_data_server"; + inherit version format; + dist = "py3"; + python = "py3"; + sha256 = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; + }; + + pythonImportsCheck = [ "tensorboard_data_server" ]; + + meta = with lib; { + description = "Fast data loading for TensorBoard"; + homepage = "https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server"; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc0389c3fcd4..05044196bf10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8635,6 +8635,8 @@ in { tenacity = callPackage ../development/python-modules/tenacity { }; + tensorboard-data-server = callPackage ../development/python-modules/tensorboard-data-server { }; + tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {}; From 85a639637bdf7543ca930c137a8f34197d335cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 23:03:32 +0200 Subject: [PATCH 14/14] python39Packages.cirq-google: fix google-api-core version constraint --- pkgs/development/python-modules/cirq-google/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index 8692aef4b678..900189dc2edb 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -16,7 +16,9 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; postPatch = '' - substituteInPlace requirements.txt --replace "protobuf~=3.13.0" "protobuf" + substituteInPlace requirements.txt \ + --replace "protobuf~=3.13.0" "protobuf" \ + --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" ''; propagatedBuildInputs = [