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: 76f803f44e2d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6a73df797c4e
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 4, 2018

  1. pythonPackages.httmock: init at 1.2.6

    @nyanloutre
    nyanloutre committed Nov 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ee4c64 View commit details

  2. pythonPackages.python-gitlab: init at 1.6.0

    @nyanloutre
    nyanloutre committed Nov 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2e49503 View commit details

  3. Merge pull request #49744 from nyanloutre/python-gitlab 

     pythonPackages.python-gitlab: init at 1.6.0
    @dotlambda
    dotlambda authored Nov 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6a73df7 View commit details
Showing with 48 additions and 0 deletions.
  1. +22 −0 pkgs/development/python-modules/httmock/default.nix
  2. +22 −0 pkgs/development/python-modules/python-gitlab/default.nix
  3. +4 −0 pkgs/top-level/python-packages.nix
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/httmock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, requests }:

buildPythonPackage rec {
pname = "httmock";
version = "1.2.6";

src = fetchFromGitHub {
owner = "patrys";
repo = "httmock";
rev = version;
sha256 = "0iya8qsb2jm03s9p6sf1yzgm1irxl3dcq0k0a9ygl0skzjz5pvab";
};

checkInputs = [ requests ];

meta = with stdenv.lib; {
description = "A mocking library for requests";
homepage = https://github.com/patrys/httmock;
license = licenses.asl20;
maintainers = with maintainers; [ nyanloutre ];
};
}
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/python-gitlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }:

buildPythonPackage rec {
pname = "python-gitlab";
version = "1.6.0";

src = fetchPypi {
inherit pname version;
sha256 = "20ceb9232f9a412ce6554056a6b5039013d0755261d57b5c8ada7035773de795";
};

propagatedBuildInputs = [ requests six ];

checkInputs = [ mock httmock ];

meta = with stdenv.lib; {
description = "Interact with GitLab API";
homepage = https://github.com/python-gitlab/python-gitlab;
license = licenses.lgpl3;
maintainers = with maintainers; [ nyanloutre ];
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1648,6 +1648,8 @@ in {
inherit (pkgs.gitAndTools) git-annex;
};

python-gitlab = callPackage ../development/python-modules/python-gitlab { };

google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { };
google-cloud-sdk-gce = callPackage ../tools/admin/google-cloud-sdk { with-gce=true; };

@@ -2460,6 +2462,8 @@ in {

html5lib = callPackage ../development/python-modules/html5lib { };

httmock = callPackage ../development/python-modules/httmock { };

http_signature = callPackage ../development/python-modules/http_signature { };

httpbin = callPackage ../development/python-modules/httpbin { };