From 7b6ef636abe4bec258caacfdda1e40dbf3de1edc Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 19 Jun 2019 17:44:24 -0700
Subject: [PATCH 1/2] pythonPackages.docker: 3.7.2 -> 4.0.1

---
 .../python-modules/docker/default.nix         | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index fc6169f1b136..74274bea9887 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -1,33 +1,38 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, six, requests, websocket_client
-, ipaddress, backports_ssl_match_hostname, docker_pycreds
+{ stdenv, buildPythonPackage, fetchPypi, isPy27
+, six, requests, websocket_client, mock, pytest
+, paramiko, backports_ssl_match_hostname
 }:
+
 buildPythonPackage rec {
-  version = "3.7.2";
+  version = "4.0.1";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c456ded5420af5860441219ff8e51cdec531d65f4a9e948ccd4133e063b72f50";
+    sha256 = "1284sqy3r6nxyz43vrpzqf25hsidpr0v4cgnbvavg2dl47bkf77n";
   };
 
   propagatedBuildInputs = [
     six
     requests
     websocket_client
-    ipaddress
-    backports_ssl_match_hostname
-    docker_pycreds
+    paramiko
+  ] ++ stdenv.lib.optional isPy27 backports_ssl_match_hostname;
+
+  checkInputs = [
+    mock
+    pytest
   ];
 
-  # Flake8 version conflict
-  doCheck = false;
+  # Other tests touch network
+  checkPhase = ''
+    ${pytest}/bin/pytest tests/unit/
+  '';
 
   meta = with stdenv.lib; {
     description = "An API client for docker written in Python";
     homepage = https://github.com/docker/docker-py;
     license = licenses.asl20;
-    maintainers = with maintainers; [
-    ];
+    maintainers = with maintainers; [ jonringer ];
   };
 }

From 73352188ba788e8cdba81c977e08360f257ccd6a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 29 Jul 2019 14:12:38 -0700
Subject: [PATCH 2/2] pythonPackages.docker: 4.0.1 -> 4.0.2

---
 pkgs/development/python-modules/docker/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index 74274bea9887..d82cc0d3f6b8 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -1,15 +1,20 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy27
-, six, requests, websocket_client, mock, pytest
-, paramiko, backports_ssl_match_hostname
+, backports_ssl_match_hostname
+, mock
+, paramiko
+, pytest
+, requests
+, six
+, websocket_client
 }:
 
 buildPythonPackage rec {
-  version = "4.0.1";
+  version = "4.0.2";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1284sqy3r6nxyz43vrpzqf25hsidpr0v4cgnbvavg2dl47bkf77n";
+    sha256 = "0r1i46h8x1vfvadayyvmh5hc6mpzgv3vvp6pv4g1wavamya2wnyc";
   };
 
   propagatedBuildInputs = [