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: 334921ad3153
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 61eecf2a39f5
Choose a head ref
  • 7 commits
  • 6 files changed
  • 1 contributor

Commits on Oct 15, 2019

  1. python.pkgs.google_cloud_storage: propagate setuptools 

    This is used during runtime.

cc #68314
    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    83e5868 View commit details

  2. python.pkgs.google_resumable_media: propagate setuptools

    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    e902b1e View commit details

  3. python.pkgs.google_api_core: propagate setuptools

    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    eb3fc12 View commit details

  4. python.pkgs.googleapis_common_protos: propagate setuptools

    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    df03455 View commit details

  5. python.pkgs.google_auth: propagate setuptools

    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    6403f81 View commit details

  6. python.pkgs.google_cloud_core: propagate setuptools

    @flokli
    flokli committed Oct 15, 2019
    Copy the full SHA
    789565d View commit details

Commits on Oct 16, 2019

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

    python.pkgs.google_cloud_storage: propagate setuptools
    @flokli
    flokli authored Oct 16, 2019
    Copy the full SHA
    61eecf2 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/google_api_core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/google_auth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/google_cloud_core/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''
8 changes: 7 additions & 1 deletion pkgs/development/python-modules/google_cloud_storage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/google_resumable_media/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/googleapis_common_protos/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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