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: e163a369c7af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f601ab37c2fb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 30, 2020

  1. pythonPackages.docker: use dontUseSetuptoolsCheck

    @veprbl
    veprbl committed Mar 30, 2020
    Copy the full SHA
    272cdfc View commit details

Commits on Apr 5, 2020

  1. Merge pull request #83748 from veprbl/pr/python_docker_dontUseSetupto… 

    …olsCheck

pythonPackages.docker: use dontUseSetuptoolsCheck
    @veprbl
    veprbl authored Apr 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f601ab3 View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/development/python-modules/docker/default.nix
11 changes: 6 additions & 5 deletions pkgs/development/python-modules/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,9 +18,7 @@ buildPythonPackage rec {
sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx";
};

nativeBuildInputs = [
pytestCheckHook
] ++ lib.optional isPy27 mock;
nativeBuildInputs = lib.optional isPy27 mock;

propagatedBuildInputs = [
paramiko
@@ -29,12 +27,15 @@ buildPythonPackage rec {
websocket_client
] ++ lib.optional isPy27 backports_ssl_match_hostname;

checkInputs = [
pytestCheckHook
];

pytestFlagsArray = [ "tests/unit" ];
# Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket
disabledTests = lib.optionals stdenv.isDarwin [ "stream_response" "socket_file" ];

# skip setuptoolsCheckPhase
doCheck = false;
dontUseSetuptoolsCheck = true;

meta = with lib; {
description = "An API client for docker written in Python";