From 99e035ac7084667e5bd019dc9964092c30b7029b Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:41:16 +1000
Subject: [PATCH 1/3] pythonPackages.progressbar2: init at 3.12.0

---
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10705d02d6b..cb012ed84b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14580,6 +14580,29 @@ in {
     };
   });
 
+  progressbar2 = buildPythonPackage (rec {
+    name = "progressbar2-${version}";
+    version = "3.12.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "WoLpH";
+      repo = "python-progressbar";
+      rev = "v${version}";
+      sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f";
+    };
+
+    buildInputs = with self; [ pytest ];
+    propagatedBuildInputs = with self; [ python-utils ];
+    doCheck = false;
+
+    meta = {
+      homepage = https://progressbar-2.readthedocs.io/en/latest/;
+      description = "Text progressbar library for python";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ ashgillman ];
+    };
+  });
+
   ldap = callPackage ../development/python-modules/ldap {
     inherit (pkgs) openldap cyrus_sasl openssl;
   };

From 19b3b1638439de3d5c8c7461298fa5f80bba4fa9 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 18:46:30 +1000
Subject: [PATCH 2/3] pythonPackages.progressbar2: move to separate file.

---
 .../python-modules/progressbar2/default.nix   | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +--------------
 2 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/progressbar2/default.nix

diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
new file mode 100644
index 00000000000..ab2fa895b22
--- /dev/null
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, python-utils
+}:
+
+buildPythonPackage (rec {
+  name = "${pname}-${version}";
+  pname = "progressbar2";
+  version = "3.12.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16r21cpjvv0spf4mymgpy7hx6977iy11k44n2w9kipwg4lhwh02k";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ python-utils ];
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://progressbar-2.readthedocs.io/en/latest/;
+    description = "Text progressbar library for python";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ashgillman ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb012ed84b4..28cc851121c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14580,28 +14580,7 @@ in {
     };
   });
 
-  progressbar2 = buildPythonPackage (rec {
-    name = "progressbar2-${version}";
-    version = "3.12.0";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "WoLpH";
-      repo = "python-progressbar";
-      rev = "v${version}";
-      sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ python-utils ];
-    doCheck = false;
-
-    meta = {
-      homepage = https://progressbar-2.readthedocs.io/en/latest/;
-      description = "Text progressbar library for python";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ ashgillman ];
-    };
-  });
+  progressbar2 = callPackage ../development/python-modules/progressbar2 { };
 
   ldap = callPackage ../development/python-modules/ldap {
     inherit (pkgs) openldap cyrus_sasl openssl;

From f4508a0adfe87f2a891e9a3188e193ed31b96011 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Wed, 17 Jan 2018 12:58:27 +1000
Subject: [PATCH 3/3] pythonPackages.progressbar2: Get tests running.

---
 .../python-modules/progressbar2/default.nix   | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index ab2fa895b22..214f81ef0de 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -1,23 +1,45 @@
 { stdenv
+, python
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, isPy3k
 , pytest
 , python-utils
+, sphinx
+, coverage
+, execnet
+, flake8
+, pytestpep8
+, pytestflakes
+, pytestcov
+, pytestcache
+, pep8
 }:
 
-buildPythonPackage (rec {
-  name = "${pname}-${version}";
+buildPythonPackage rec {
   pname = "progressbar2";
   version = "3.12.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "16r21cpjvv0spf4mymgpy7hx6977iy11k44n2w9kipwg4lhwh02k";
+  # Use source from GitHub, PyPI is missing tests
+  # https://github.com/WoLpH/python-progressbar/issues/151
+  src = fetchFromGitHub {
+    owner = "WoLpH";
+    repo = "python-progressbar";
+    rev = "v${version}";
+    sha256 = "1gk45sh8cd0kkyvzcvx95z6nlblmyx0x189mjfv3vfa43cr1mb0f";
   };
 
-  buildInputs = [ pytest ];
   propagatedBuildInputs = [ python-utils ];
-  doCheck = false;
+  checkInputs = [
+    pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov
+    pytestcache pep8
+  ];
+  # ignore tests on the nix wrapped setup.py and don't flake .eggs directory
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} setup.py test --addopts "--ignore=nix_run_setup.py --ignore=.eggs"
+    runHook postCheck
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://progressbar-2.readthedocs.io/en/latest/;
@@ -25,4 +47,4 @@ buildPythonPackage (rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [ ashgillman ];
   };
-})
+}