colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #135435 from SuperSandro2000/google

Browse Source
This commit is contained in:
Sandro 2021-08-25 13:15:39 +02:00 committed by GitHub
commit f9d4579b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 135 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/cirq-google/default.nix
View File

@ -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 = [

11
pkgs/development/python-modules/google-api-core/default.nix
View File

@ -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 ];
};

6
pkgs/development/python-modules/google-auth/default.nix
View File

@ -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
];

5
pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
View File

@ -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

25
pkgs/development/python-modules/google-cloud-audit-log/default.nix Normal file
View File

@ -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 ];
};
}

10
pkgs/development/python-modules/google-cloud-bigquery/default.nix
View File

@ -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 = [
@ -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

4
pkgs/development/python-modules/google-cloud-core/default.nix
View File

@ -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 ];

6
pkgs/development/python-modules/google-cloud-firestore/default.nix
View File

@ -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 = [

10
pkgs/development/python-modules/google-cloud-logging/default.nix
View File

@ -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

13
pkgs/development/python-modules/google-cloud-spanner/default.nix
View File

@ -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"

4
pkgs/development/python-modules/google-resumable-media/default.nix
View File

@ -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 ];

25
pkgs/development/python-modules/tensorboard-data-server/default.nix Normal file
View File

@ -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 ];
};
}

42
pkgs/development/python-modules/tensorflow-tensorboard/default.nix
View File

@ -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 ];
};

4
pkgs/top-level/python-packages.nix
View File

@ -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 { };
@ -8641,6 +8643,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 {};