diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-04-05 00:41:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-05 00:41:06 -0400 |
| commit | f601ab37c2fb7e5f65989a92df383bcd6942567a (patch) | |
| tree | 2b9129ae698a14208b81728d39258e4e809685cb | |
| parent | e163a369c7aff64dce900d0b492c07c53b8b4a14 (diff) | |
| parent | 272cdfcd6cacf648d232d545c49a9357fe4c0bcb (diff) | |
| download | nixlib-f601ab37c2fb7e5f65989a92df383bcd6942567a.tar nixlib-f601ab37c2fb7e5f65989a92df383bcd6942567a.tar.gz nixlib-f601ab37c2fb7e5f65989a92df383bcd6942567a.tar.bz2 nixlib-f601ab37c2fb7e5f65989a92df383bcd6942567a.tar.lz nixlib-f601ab37c2fb7e5f65989a92df383bcd6942567a.tar.xz nixlib-f601ab37c2fb7e5f65989a92df383bcd6942567a.tar.zst nixlib-f601ab37c2fb7e5f65989a92df383bcd6942567a.zip | |
Merge pull request #83748 from veprbl/pr/python_docker_dontUseSetuptoolsCheck
pythonPackages.docker: use dontUseSetuptoolsCheck
| -rw-r--r-- | pkgs/development/python-modules/docker/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 701a211a6bb4..a31ba7c69c03 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -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"; |