Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a7de168b1257
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a361626b6ea0
Choose a head ref
  • 20 commits
  • 21 files changed
  • 1 contributor

Commits on Nov 6, 2020

  1. python3Packages.google-cloud-iam: init at 2.0.0

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    2778cf6 View commit details
  2. python3Packages.google_api_core: 1.22.1 -> 1.22.4

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    b642192 View commit details
  3. python3Packages.google_auth: 1.20.1 -> 1.22.1

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    618da39 View commit details
  4. python3Packages.google_cloud_automl: 1.0.1 -> 2.0.0

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    c4d8e97 View commit details
  5. python3Packages.google_cloud_bigquery: 1.26.1 -> 2.1.0

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    f2b0d07 View commit details
  6. python3Packages.google_cloud_container: 2.0.1 -> 2.1.0

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    7cbe301 View commit details
  7. python3Packages.google_cloud_core: 1.4.1 -> 1.4.3

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    d1cd5b6 View commit details
  8. python3Packages.google_cloud_error_reporting: 0.34.0 -> 1.0.0

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    3305029 View commit details
  9. python3Packages.google_cloud_kms: 2.0.1 -> 2.2.0

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    3eda2da View commit details
  10. python3Packages.google_cloud_logging: fix tests

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    9324ba6 View commit details
  11. python3Packages.google_cloud_pubsub: 1.7.0 -> 2.1.0

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    24d644d View commit details
  12. python3Packages.google_cloud_resource_manager: fix tests

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    7fbefa7 View commit details
  13. python3Packages.google_cloud_runtimeconfig: fix tests

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    d6e7e3c View commit details
  14. python3Packages.google_cloud_spanner: 1.17.1 -> 1.19.1

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    d0b5401 View commit details
  15. python3Packages.google_cloud_storage: fix tests

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    d19278d View commit details
  16. pythonPackages.google_cloud_testutils: unstable -> 0.1.0

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    51f1715 View commit details
  17. python3Packages.google_cloud_texttospeech: fix build

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    9a902f2 View commit details
  18. python3Packages.google_cloud_translate: fix tests

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    3a0da73 View commit details
  19. python3Packages.google_cloud_websecurityscanner: fix build

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    b99504f View commit details
  20. patroni: fix tests

    austinbutler authored and Jonathan Ringer committed Nov 6, 2020
    Copy the full SHA
    a361626 View commit details
Showing with 291 additions and 296 deletions.
  1. +22 −0 pkgs/development/python-modules/google-cloud-iam/default.nix
  2. +16 −20 pkgs/development/python-modules/google_api_core/default.nix
  3. +11 −24 pkgs/development/python-modules/google_auth/default.nix
  4. +21 −17 pkgs/development/python-modules/google_cloud_automl/default.nix
  5. +28 −24 pkgs/development/python-modules/google_cloud_bigquery/default.nix
  6. +10 −13 pkgs/development/python-modules/google_cloud_container/default.nix
  7. +14 −10 pkgs/development/python-modules/google_cloud_core/default.nix
  8. +14 −14 pkgs/development/python-modules/google_cloud_error_reporting/default.nix
  9. +12 −16 pkgs/development/python-modules/google_cloud_kms/default.nix
  10. +17 −15 pkgs/development/python-modules/google_cloud_logging/default.nix
  11. +16 −18 pkgs/development/python-modules/google_cloud_pubsub/default.nix
  12. +14 −13 pkgs/development/python-modules/google_cloud_resource_manager/default.nix
  13. +13 −13 pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
  14. +15 −18 pkgs/development/python-modules/google_cloud_spanner/default.nix
  15. +20 −17 pkgs/development/python-modules/google_cloud_storage/default.nix
  16. +10 −22 pkgs/development/python-modules/google_cloud_testutils/default.nix
  17. +9 −13 pkgs/development/python-modules/google_cloud_texttospeech/default.nix
  18. +20 −15 pkgs/development/python-modules/google_cloud_translate/default.nix
  19. +6 −13 pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
  20. +1 −1 pkgs/servers/sql/patroni/default.nix
  21. +2 −0 pkgs/top-level/python-packages.nix
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/google-cloud-iam/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
, google_api_core, libcst, mock, proto-plus, pytest-asyncio }:

buildPythonPackage rec {
pname = "google-cloud-iam";
version = "2.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak";
};

propagatedBuildInputs = [ google_api_core libcst proto-plus ];
checkInputs = [ mock pytestCheckHook pytest-asyncio ];

meta = with lib; {
description = "Google Cloud IAM API client library";
homepage = "https://github.com/googleapis/python-iam";
license = licenses.asl20;
maintainers = with maintainers; [ austinbutler ];
};
}
36 changes: 16 additions & 20 deletions pkgs/development/python-modules/google_api_core/default.nix
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio
, mock
}:
{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_auth, protobuf
, googleapis_common_protos, requests, grpcio, mock, pytest, pytest-asyncio, pytestCheckHook }:

buildPythonPackage rec {
pname = "google-api-core";
version = "1.22.1";
disabled = isPy27; # google namespace no longer works on python2
version = "1.22.4";
disabled = pythonOlder "3.5";

src = fetchPypi {
inherit pname version;
sha256 = "35cba563034d668ae90ffe1f03193a84e745b38f09592f60258358b5e5ee6238";
sha256 = "06pck3hwl1pks26q843hv6pxchby9viab05mxf72k7ksab17m7aa";
};

propagatedBuildInputs = [
googleapis_common_protos protobuf
google_auth requests setuptools grpcio
];
propagatedBuildInputs =
[ googleapis_common_protos protobuf google_auth requests grpcio ];

# requires nox
doCheck = false;
checkInputs = [ mock ];
checkInputs = [ google_auth mock protobuf pytest-asyncio pytestCheckHook ];

pythonImportsCheck = [
"google.auth"
"google.protobuf"
"google.api"
];
# prevent google directory from shadowing google imports
preCheck = ''
rm -r google
'';

pythonImportsCheck = [ "google.auth" "google.protobuf" "google.api" ];

meta = with lib; {
description = "Core Library for Google Client Libraries";
@@ -35,7 +30,8 @@ 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; [ ];
};
35 changes: 11 additions & 24 deletions pkgs/development/python-modules/google_auth/default.nix
Original file line number Diff line number Diff line change
@@ -1,55 +1,42 @@
{ stdenv, buildPythonPackage, fetchpatch, fetchPypi
, cachetools
, flask
, freezegun
, mock
, oauth2client
, pyasn1-modules
, pytest
, pytest-localserver
, requests
, responses
, rsa
, setuptools
, six
, urllib3
}:
{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client
, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa
, setuptools, six, urllib3 }:

buildPythonPackage rec {
pname = "google-auth";
version = "1.20.1";
version = "1.22.1";

src = fetchPypi {
inherit pname version;
sha256 = "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8";
sha256 = "1fs448jcx2cbpk0nq3picndfryjsakmd9allggvh7mrqjiw723ww";
};

disabled = pythonOlder "3.5";

propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];

checkInputs = [
flask
freezegun
mock
oauth2client
pytest
pytestCheckHook
pytest-localserver
requests
responses
urllib3
];

checkPhase = ''
py.test
'';

meta = with stdenv.lib; {
description = "Google Auth Python Library";
longDescription = ''
This library simplifies using Google’s various server-to-server
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";
changelog =
"https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
# Documentation: https://googleapis.dev/python/google-auth/latest/index.html
license = licenses.asl20;
maintainers = with maintainers; [ ];
38 changes: 21 additions & 17 deletions pkgs/development/python-modules/google_cloud_automl/default.nix
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, google_api_core
, google_cloud_storage
, pandas
, pytest
, mock
}:
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, libcst
, google_api_core, google_cloud_storage, google_cloud_testutils, pandas
, proto-plus, pytest-asyncio, mock }:

buildPythonPackage rec {
pname = "google-cloud-automl";
version = "1.0.1";
version = "2.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "f08abe78d37fb94a3748aa43e66dae2bad52f991cc7740501a341bc6f6387fd5";
sha256 = "16hr1i2771z4yh19xg6kk037h9cv5j64q5bxb9nmkvj12hdwbwgv";
};

checkInputs = [ pandas pytest mock google_cloud_storage ];
propagatedBuildInputs = [ enum34 google_api_core ];
disabled = pythonOlder "3.6";

checkInputs = [
google_cloud_storage
google_cloud_testutils
mock
pandas
pytest-asyncio
pytestCheckHook
];
propagatedBuildInputs = [ google_api_core libcst proto-plus ];

# ignore tests which need credentials
checkPhase = ''
pytest tests/unit -k 'not upload and not prediction_client_client_info'
disabledTests = [ "test_prediction_client_client_info" ];
preCheck = ''
rm -r google
rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py
'';

meta = with stdenv.lib; {
description = "Cloud AutoML API client library";
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
homepage = "https://github.com/googleapis/python-automl";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
52 changes: 28 additions & 24 deletions pkgs/development/python-modules/google_cloud_bigquery/default.nix
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, freezegun
, google_resumable_media
, google_api_core
, google_cloud_core
, pandas
, pyarrow
, pytest
, mock
, ipython
}:
{ 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 }:

buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "1.26.1";
version = "2.1.0";

src = fetchPypi {
inherit pname version;
sha256 = "51c29b95d460486d9e0210f63e8193691cd08480b69775270e84dd3db87c1bf2";
sha256 = "0x5g6n151rcdgq4s80f71zpsl7bsvyyrs07l58psdpyd3kwf4sbk";
};

checkInputs = [ pytest mock ipython freezegun ];
propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ];
disabled = pythonOlder "3.6";

# prevent local directory from shadowing google imports
# call_api_applying_custom_retry_on_timeout requires credentials
checkInputs =
[ freezegun google_cloud_testutils ipython mock pytestCheckHook ];
propagatedBuildInputs = [
google_resumable_media
google_api_core
google_cloud_core
pandas
proto-plus
pyarrow
];

# prevent google directory from shadowing google imports
# test_magics requires modifying sys.path
checkPhase = ''
preCheck = ''
rm -r google
pytest tests/unit \
-k 'not call_api_applying_custom_retry_on_timeout' \
--ignore=tests/unit/test_magics.py
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"
];

meta = with stdenv.lib; {
description = "Google BigQuery API client library";
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
homepage = "https://pypi.org/project/google-cloud-bigquery";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
23 changes: 10 additions & 13 deletions pkgs/development/python-modules/google_cloud_container/default.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, grpc_google_iam_v1
, pytest
, mock
}:
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, google_api_core
, grpc_google_iam_v1, libcst, mock, proto-plus, pytest, pytest-asyncio }:

buildPythonPackage rec {
pname = "google-cloud-container";
version = "2.0.1";
version = "2.1.0";

src = fetchPypi {
inherit pname version;
sha256 = "6f714e3d427e2b36d1365fc400f4d379972529fb40f798d9c0e06c7c3418fc89";
sha256 = "07rcq4c49zfaacyn5df62bs7qjf5hpmdm9mpb6nx510lylq0507x";
};

checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 ];
disabled = pythonOlder "3.6";

checkInputs = [ mock pytest pytest-asyncio ];
propagatedBuildInputs =
[ google_api_core grpc_google_iam_v1 libcst proto-plus ];

checkPhase = ''
pytest tests/unit
'';

meta = with stdenv.lib; {
description = "Google Container Engine API client library";
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
homepage = "https://github.com/googleapis/python-container";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
24 changes: 14 additions & 10 deletions pkgs/development/python-modules/google_cloud_core/default.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
{ stdenv, buildPythonPackage, fetchPypi, python
, google_api_core, grpcio, pytest, mock, setuptools }:
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, python
, google_api_core, grpcio, mock }:

buildPythonPackage rec {
pname = "google-cloud-core";
version = "1.4.1";
version = "1.4.3";

src = fetchPypi {
inherit pname version;
sha256 = "613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507";
sha256 = "103bgv9d6fw01vbbdx0qxa5gqdzxqmiwlpdvibmqxkhb3c6bgbr1";
};

propagatedBuildInputs = [ google_api_core grpcio setuptools ];
checkInputs = [ pytest mock ];
disabled = pythonOlder "3.5";

checkPhase = ''
cd tests
${python.interpreter} -m unittest discover
propagatedBuildInputs = [ google_api_core grpcio ];
checkInputs = [ google_api_core mock pytestCheckHook ];

pythonImportsCheck = [ "google.cloud" ];

# prevent google directory from shadowing google imports
preCheck = ''
rm -r google
'';

meta = with stdenv.lib; {
description = "API Client library for Google Cloud: Core Helpers";
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
homepage = "https://github.com/googleapis/python-cloud-core";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
Loading