From 83e58687baa9ee03b5216f6e69e4d7e1bfb85006 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 10 Oct 2019 10:58:58 +0200 Subject: [PATCH 1/6] python.pkgs.google_cloud_storage: propagate setuptools This is used during runtime. cc #68314 --- .../python-modules/google_cloud_storage/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index efb0c6aacd8..bdd9049e7d4 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -6,6 +6,7 @@ , google_cloud_core , pytest , mock +, setuptools }: buildPythonPackage rec { @@ -17,8 +18,13 @@ buildPythonPackage rec { sha256 = "8032e576e2f91a1d3de2355118040c3bcd9916e0453a6b3f64c1b42ed151690a"; }; + propagatedBuildInputs = [ + google_resumable_media + google_api_core + google_cloud_core + setuptools + ]; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core ]; checkPhase = '' pytest tests/unit From e902b1e23b8780d991a34f418399d4dd8f234217 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 15 Oct 2019 23:55:41 +0200 Subject: [PATCH 2/6] python.pkgs.google_resumable_media: propagate setuptools --- .../python-modules/google_resumable_media/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 096f93b017f..afc1a43660f 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -3,6 +3,7 @@ , fetchPypi , six , requests +, setuptools , pytest , mock }: @@ -17,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ six requests ]; + propagatedBuildInputs = [ requests setuptools six ]; checkPhase = '' py.test tests/unit From eb3fc129bb40ad5c393217684572f98bd92fa359 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 15 Oct 2019 23:57:07 +0200 Subject: [PATCH 3/6] python.pkgs.google_api_core: propagate setuptools --- pkgs/development/python-modules/google_api_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 5cb027eef46..c96230bcf18 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,5 +1,5 @@ { 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 { pname = "google-api-core"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ googleapis_common_protos protobuf - google_auth requests grpcio + google_auth requests setuptools grpcio ] ++ lib.optional (pythonOlder "3.2") futures; checkInputs = [ mock pytest ]; From df03455a63b00e1fb357783903ed91ec36f21813 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 15 Oct 2019 23:58:19 +0200 Subject: [PATCH 4/6] python.pkgs.googleapis_common_protos: propagate setuptools --- .../python-modules/googleapis_common_protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 337624012aa..2ae649b7432 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, protobuf, pytest }: +, protobuf, pytest, setuptools }: buildPythonPackage rec { pname = "googleapis-common-protos"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "d564872083af40bbcc7091340f17db778a316525c7c76497d58d11b98ca2aa74"; }; - propagatedBuildInputs = [ protobuf ]; + propagatedBuildInputs = [ protobuf setuptools ]; checkInputs = [ pytest ]; doCheck = false; # there are no tests From 6403f819a83074068aaa0485ddb04243167b7d14 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 15 Oct 2019 23:59:25 +0200 Subject: [PATCH 5/6] python.pkgs.google_auth: propagate setuptools --- pkgs/development/python-modules/google_auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 315d4756e0d..01797673fba 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -1,5 +1,5 @@ { 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 { pname = "google-auth"; @@ -18,7 +18,7 @@ buildPythonPackage rec { ]; 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 # but the latter is deprecated. Since it is not currently part of the nixpkgs collection and deprecated it will From 789565dee4b6a10470115b426da603b45680983d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 16 Oct 2019 00:02:05 +0200 Subject: [PATCH 6/6] python.pkgs.google_cloud_core: propagate setuptools --- 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 c57433a3ebd..3aafa3e2687 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, google_api_core, grpcio, pytest, mock }: +, google_api_core, grpcio, pytest, mock, setuptools }: buildPythonPackage rec { pname = "google-cloud-core"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "d85b1aaaf3bad9415ad1d8ee5eadce96d7007a82f13ce0a0629a003a11e83f29"; }; - propagatedBuildInputs = [ google_api_core grpcio ]; + propagatedBuildInputs = [ google_api_core grpcio setuptools ]; checkInputs = [ pytest mock ]; checkPhase = ''