python.pkgs.google_cloud_storage: propagate setuptools (#70900)

python.pkgs.google_cloud_storage: propagate setuptools
This commit is contained in:
Florian Klink 2019-10-16 16:48:39 +02:00 committed by GitHub
commit 61eecf2a39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 10 deletions

View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder { lib, buildPythonPackage, fetchPypi, pythonOlder
, google_auth, protobuf, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: , google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, futures, mock, pytest }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-api-core"; pname = "google-api-core";
@ -12,7 +12,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
googleapis_common_protos protobuf googleapis_common_protos protobuf
google_auth requests grpcio google_auth requests setuptools grpcio
] ++ lib.optional (pythonOlder "3.2") futures; ] ++ lib.optional (pythonOlder "3.2") futures;
checkInputs = [ mock pytest ]; checkInputs = [ mock pytest ];

View File

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchpatch, fetchPypi { stdenv, buildPythonPackage, fetchpatch, fetchPypi
, pytest, mock, oauth2client, flask, requests, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa }: , pytest, mock, oauth2client, flask, requests, setuptools, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-auth"; pname = "google-auth";
@ -18,7 +18,7 @@ buildPythonPackage rec {
]; ];
checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ]; checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ];
propagatedBuildInputs = [ six pyasn1-modules cachetools rsa ]; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
# The removed test tests the working together of google_auth and google's https://pypi.python.org/pypi/oauth2client # The removed test tests the working together of google_auth and google's https://pypi.python.org/pypi/oauth2client
# but the latter is deprecated. Since it is not currently part of the nixpkgs collection and deprecated it will # but the latter is deprecated. Since it is not currently part of the nixpkgs collection and deprecated it will

View File

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, google_api_core, grpcio, pytest, mock }: , google_api_core, grpcio, pytest, mock, setuptools }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-core"; pname = "google-cloud-core";
@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "d85b1aaaf3bad9415ad1d8ee5eadce96d7007a82f13ce0a0629a003a11e83f29"; sha256 = "d85b1aaaf3bad9415ad1d8ee5eadce96d7007a82f13ce0a0629a003a11e83f29";
}; };
propagatedBuildInputs = [ google_api_core grpcio ]; propagatedBuildInputs = [ google_api_core grpcio setuptools ];
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];
checkPhase = '' checkPhase = ''

View File

@ -6,6 +6,7 @@
, google_cloud_core , google_cloud_core
, pytest , pytest
, mock , mock
, setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,8 +18,13 @@ buildPythonPackage rec {
sha256 = "8032e576e2f91a1d3de2355118040c3bcd9916e0453a6b3f64c1b42ed151690a"; sha256 = "8032e576e2f91a1d3de2355118040c3bcd9916e0453a6b3f64c1b42ed151690a";
}; };
propagatedBuildInputs = [
google_resumable_media
google_api_core
google_cloud_core
setuptools
];
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core ];
checkPhase = '' checkPhase = ''
pytest tests/unit pytest tests/unit

View File

@ -3,6 +3,7 @@
, fetchPypi , fetchPypi
, six , six
, requests , requests
, setuptools
, pytest , pytest
, mock , mock
}: }:
@ -17,7 +18,7 @@ buildPythonPackage rec {
}; };
checkInputs = [ pytest mock ]; checkInputs = [ pytest mock ];
propagatedBuildInputs = [ six requests ]; propagatedBuildInputs = [ requests setuptools six ];
checkPhase = '' checkPhase = ''
py.test tests/unit py.test tests/unit

View File

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, protobuf, pytest }: , protobuf, pytest, setuptools }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "googleapis-common-protos"; pname = "googleapis-common-protos";
@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "d564872083af40bbcc7091340f17db778a316525c7c76497d58d11b98ca2aa74"; sha256 = "d564872083af40bbcc7091340f17db778a316525c7c76497d58d11b98ca2aa74";
}; };
propagatedBuildInputs = [ protobuf ]; propagatedBuildInputs = [ protobuf setuptools ];
checkInputs = [ pytest ]; checkInputs = [ pytest ];
doCheck = false; # there are no tests doCheck = false; # there are no tests