From 8678c0339d4595008c674cc4e7815bac35fbf477 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:54:44 -0700
Subject: [PATCH 01/20] aenum: 1.4.7 -> 2.0.3

---
 pkgs/development/python-modules/aenum/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index 1233b94dccd..9d6fe94a262 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
   pname = "aenum";
-  version = "1.4.7";
+  version = "2.0.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bvn2k53nz99fiwql5fkl0fh7xjw8ama9qzdjp36609mpk05ikl8";
+    sha256 = "0rlhb5wzlyyz0l44r2jxn3m0nh51ifih97dk2y7zfs1m299gwcv6";
   };
 
+  doCheck = !isPy3k;
+  # The following tests fail (only in python3
+  # test_convert (aenum.test.TestIntEnumConvert)
+  # test_convert_value_lookup_priority (aenum.test.TestIntEnumConvert)
+  # test_convert (aenum.test.TestIntEnumConvert)
+  # test_convert_value_lookup_priority (aenum.test.TestIntEnumConvert)
+
   meta = {
     description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
-    maintainer = with stdenv.lib.maintainers; [ vrthra ];
+    maintainers = with stdenv.lib.maintainers; [ vrthra ];
     license = with stdenv.lib.licenses; [ bsd3 ];
     homepage = https://bitbucket.org/stoneleaf/aenum;
   };

From 92d18827d40eef32fafa26d5d097059cd77c1e08 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:56:36 -0700
Subject: [PATCH 02/20] agate: 1.2.2 -> 1.6.0

---
 pkgs/top-level/python-packages.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 774ef2fb0fc..e3d137e467f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -115,8 +115,7 @@ in {
   aenum = callPackage ../development/python-modules/aenum { };
 
   agate = buildPythonPackage rec {
-    name = "agate-1.2.2";
-    disabled = isPy3k;
+    name = "agate-1.6.0";
 
     meta = {
       description = "A Python data analysis library that is optimized for humans instead of machines";
@@ -125,11 +124,15 @@ in {
       maintainers = with maintainers; [ vrthra ];
     };
 
-    propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel pytimeparse ];
+    doCheck = false;
+    # (only) on python3 unittest loader (loadTestsFromModule) fails
+
+    propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel
+         pytimeparse leather python-slugify ];
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/agate/${name}.tar.gz";
-      sha256 = "0h2w30a0zhylivz86d823a05hvg8w8p61lmm855z1wwkgml9l9d4";
+      sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm";
     };
   };
 

From 390f67924fc9990197470458d4ff2955d13202dd Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:57:18 -0700
Subject: [PATCH 03/20] agate-dbf: 0.1.0 -> 0.2.0

---
 pkgs/top-level/python-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3d137e467f..bd361825222 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -139,8 +139,7 @@ in {
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 
   agate-dbf = buildPythonPackage rec {
-    name = "agate-dbf-0.1.0";
-    disabled = isPy3k;
+    name = "agate-dbf-0.2.0";
 
     meta = {
       description = "Adds read support for dbf files to agate";
@@ -153,7 +152,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/agate-dbf/${name}.tar.gz";
-      sha256 = "0xzz834lh4xbl342c6wmxqy7ynmsrjp42bsjahfcxhsgq33vzngz";
+      sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6";
     };
   };
 

From fcd954181c54778390e951a46801139f9df169fd Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:58:31 -0700
Subject: [PATCH 04/20] agate-excel: 0.1.0 -> 0.2.1

---
 pkgs/top-level/python-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd361825222..3d3a127a0cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -157,8 +157,7 @@ in {
   };
 
   agate-excel = buildPythonPackage rec {
-    name = "agate-excel-0.1.0";
-    disabled = isPy3k;
+    name = "agate-excel-0.2.1";
 
     meta = {
       description = "Adds read support for excel files to agate";
@@ -171,7 +170,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/agate-excel/${name}.tar.gz";
-      sha256 = "08zvj3pwqw8zhd58iyymiwblrk92y4gl6yyrb2svb0k8za7v0hak";
+      sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7";
     };
   };
 

From 36acb4ec3e7a6f93f26ae59e313f048db0335188 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:59:06 -0700
Subject: [PATCH 05/20] agate-sql: Init at 0.5.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d3a127a0cd..8cdf4ecbe13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -174,6 +174,24 @@ in {
     };
   };
 
+  agate-sql = buildPythonPackage rec {
+    name = "agate-sql-0.5.2";
+
+    meta = {
+      description = "Adds SQL read/write support to agate.";
+      homepage    = https://github.com/wireservice/agate-sql;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ vrthra ];
+    };
+
+    propagatedBuildInputs = with self; [ agate sqlalchemy ];
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/a/agate-sql/${name}.tar.gz";
+      sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14";
+    };
+  };
+
   ansicolor = buildPythonPackage rec {
     name = "ansicolor-${version}";
     version = "0.2.4";

From fddbb6b1ee99037077732789328a36254b3dd0d4 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:59:48 -0700
Subject: [PATCH 06/20] dbf: 0.94.003 -> 0.96.8

---
 pkgs/top-level/python-packages.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8cdf4ecbe13..69605ddab3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -226,8 +226,12 @@ in {
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
 
   dbf = buildPythonPackage rec {
-    name = "dbf-0.94.003";
-    disabled = isPy3k;
+    name = "dbf-0.96.8";
+
+    propagatedBuildInputs = [ self.aenum ];
+
+    doCheck = false;
+    # (only) on python3 the unittest loader (loadTestsFromName(submodule)) fails
 
     meta = {
       description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
@@ -238,7 +242,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/dbf/${name}.tar.gz";
-      sha256 = "0i2454hwg67079jb56x663wqmmwr55pcr6c76q2415185y6nhny9";
+      sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1";
     };
   };
 

From 6040adc67400f792879de0833472cdcd73d94c94 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:00:33 -0700
Subject: [PATCH 07/20] python-slugify: Init at 1.2.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69605ddab3c..a4900cfe04d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1609,6 +1609,28 @@ in {
     };
   }));
 
+  python-slugify = buildPythonPackage rec {
+    name = "python-slugify-${version}";
+    version = "1.2.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/python-slugify/${name}.tar.gz";
+      sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp";
+    };
+    doCheck = false;
+    # (only) on python3 unittest loader (loadTestsFromModule) fails
+
+    propagatedBuildInputs = with self; [ unidecode regex ];
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/un33k/python-slugify;
+      description = "A Python Slugify application that handles Unicode";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ vrthra ];
+    };
+  };
+
   awesome-slugify = buildPythonPackage rec {
     name = "awesome-slugify-${version}";
     version = "1.6.5";

From 918773356d9a9c0923ddde97bdf1ca5de2453ba7 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:00:58 -0700
Subject: [PATCH 08/20] dbfread: Enable python3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a4900cfe04d..69dc1c31423 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -249,7 +249,6 @@ in {
 
   dbfread = buildPythonPackage rec {
     name = "dbfread-2.0.5";
-    disabled = isPy3k;
 
     meta = {
       description = "Read DBF Files with Python";

From 9b5b713d8f525c400f7406ec35c2dac851975586 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:01:30 -0700
Subject: [PATCH 09/20] csvkit: 0.9.1 -> 1.0.2

---
 pkgs/top-level/python-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69dc1c31423..fa8e7df9766 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2575,15 +2575,19 @@ in {
 
   csvkit = buildPythonPackage rec {
     name = "csvkit-${version}";
-    version = "0.9.1";
-    disabled = isPy3k;
+    version = "1.0.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/csvkit/${name}.tar.gz";
-      sha256 = "0fprr4wgp0bq8kl5qims88np11af7ahr5bxkrhfwpdgcgdjbiy4j";
+      sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
     };
 
-    propagatedBuildInputs = with self; [ dateutil_2_2 dbf xlrd sqlalchemy openpyxl_2_2_0_b1 ];
+    propagatedBuildInputs = with self; [ dateutil dbf xlrd sqlalchemy openpyxl
+      agate-excel agate-dbf agate-sql ];
+
+    doCheck = false;
+    # (only) python 3 we had 9 failures and 57 errors out of a much larger
+    # number of tests.
 
     meta = {
       description = "A library of utilities for working with CSV, the king of tabular file formats";

From 5d1c598655ef557ef3a6a7c79761aaaff9dabf45 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Mon, 1 May 2017 12:20:51 -0700
Subject: [PATCH 10/20] dateutil: remove 2_2

---
 pkgs/top-level/python-packages.nix | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa8e7df9766..f98a5dd6f1f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6058,27 +6058,6 @@ in {
 
   dateutil = callPackage ../development/python-modules/dateutil { };
 
-  # csvkit 0.9.1 needs dateutil==2.2
-  dateutil_2_2 = buildPythonPackage (rec {
-    name = "dateutil-2.2";
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ self.six ];
-
-    buildInputs = [ pkgs.glibcLocales ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
-      sha256 = "0s74ad6r789810s10dxgvaf48ni6adac2icrdad34zxygqq6bj7f";
-    };
-
-    meta = {
-      description = "Powerful extensions to the standard datetime module";
-      homepage = http://pypi.python.org/pypi/python-dateutil;
-      license = "BSD-style";
-    };
-  });
-
   # Buildbot 0.8.7p1 needs dateutil==1.5
   dateutil_1_5 = buildPythonPackage (rec {
     name = "dateutil-1.5";

From d76e68423ff67200aba23ae38ceda61a23c983bf Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 20:46:08 -0700
Subject: [PATCH 11/20] openpyxl: remove 2_2_0_b1

---
 pkgs/top-level/python-packages.nix | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f98a5dd6f1f..63fefc324d8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16434,31 +16434,6 @@ in {
     doCheck = false;
   };
 
-  openpyxl_2_2_0_b1 = buildPythonPackage rec {
-    version = "2.2.0-b1";
-    name = "openpyxl-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/openpyxl/${name}.tar.gz";
-      sha256 = "0n10pawp2558jrrmppyhkrv7889k3g4mifqj3fp68qbr20ldk51k";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ];
-
-    # Tests are not included in archive.
-    # https://bitbucket.org/openpyxl/openpyxl/issues/610
-    doCheck = false;
-
-    meta = {
-      description = "A Python library to read/write Excel 2007 xlsx/xlsm files";
-      homepage = https://openpyxl.readthedocs.org;
-      license = licenses.mit;
-      maintainers = with maintainers; [ lihop sjourdois ];
-      platforms = platforms.all;
-    };
-  };
-
   openpyxl = buildPythonPackage rec {
     version = "2.3.5";
     name = "openpyxl-${version}";

From 4036bc91da25b31f846431ee6dce77b6f48d4c06 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:08:10 -0700
Subject: [PATCH 12/20] agate: refactor

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

diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix
new file mode 100644
index 00000000000..3ff097a78cf
--- /dev/null
+++ b/pkgs/development/python-modules/agate/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k,
+  discid, six, parsedatetime, isodate, Babel, pytimeparse,
+  leather, python-slugify }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "agate";
+    version = "1.6.0";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm";
+    };
+
+    propagatedBuildInputs = [ discid six parsedatetime
+         isodate Babel pytimeparse leather python-slugify ];
+
+    doCheck = !isPy3k;
+    # (only) on python3 unittest loader (loadTestsFromModule) fails
+
+    meta = with stdenv.lib; {
+      description = "A Python data analysis library that is optimized for humans instead of machines";
+      homepage    = https://github.com/wireservice/agate;
+      license     = with licenses; [ mit ];
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63fefc324d8..8bb828402bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -114,27 +114,7 @@ in {
 
   aenum = callPackage ../development/python-modules/aenum { };
 
-  agate = buildPythonPackage rec {
-    name = "agate-1.6.0";
-
-    meta = {
-      description = "A Python data analysis library that is optimized for humans instead of machines";
-      homepage    = "https://github.com/wireservice/agate";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    doCheck = false;
-    # (only) on python3 unittest loader (loadTestsFromModule) fails
-
-    propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel
-         pytimeparse leather python-slugify ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/agate/${name}.tar.gz";
-      sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm";
-    };
-  };
+  agate = callPackage ../development/python-modules/agate { };
 
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 

From 90daf2de276b774c8da7e605f4dd7d90358e1824 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:09:41 -0700
Subject: [PATCH 13/20] agate-dbf: refactor

---
 .../python-modules/agate-dbf/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 ++----------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/agate-dbf/default.nix

diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix
new file mode 100644
index 00000000000..11409a11778
--- /dev/null
+++ b/pkgs/development/python-modules/agate-dbf/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, agate, dbf, dbfread }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "agate-dbf";
+    version = "0.2.0";
+
+    propagatedBuildInputs = [ agate dbf dbfread ];
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Adds read support for dbf files to agate";
+      homepage    = https://github.com/wireservice/agate-dbf;
+      license     = with licenses; [ mit ];
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8bb828402bb..45307356282 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -116,26 +116,10 @@ in {
 
   agate = callPackage ../development/python-modules/agate { };
 
+  agate-dbf = callPackage ../development/python-modules/agate-dbf { };
+
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 
-  agate-dbf = buildPythonPackage rec {
-    name = "agate-dbf-0.2.0";
-
-    meta = {
-      description = "Adds read support for dbf files to agate";
-      homepage    = "https://github.com/wireservice/agate-dbf";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    propagatedBuildInputs = with self; [ agate dbf dbfread ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/agate-dbf/${name}.tar.gz";
-      sha256 = "0pkk6m873xpqj77ja6ylmg8v41abpn4bvsqw6mh2hjyd0snw2rh6";
-    };
-  };
-
   agate-excel = buildPythonPackage rec {
     name = "agate-excel-0.2.1";
 

From 4365d634c8ed6a37e898820cbc888194a96013e8 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:10:26 -0700
Subject: [PATCH 14/20] agate-excel: refactor

---
 .../python-modules/agate-excel/default.nix    | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +--------------
 2 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/agate-excel/default.nix

diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix
new file mode 100644
index 00000000000..cb0113c22b3
--- /dev/null
+++ b/pkgs/development/python-modules/agate-excel/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, agate, openpyxl, xlrd }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "agate-excel";
+    version = "0.2.1";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7";
+    };
+
+    propagatedBuildInputs = [ agate openpyxl xlrd ];
+
+    meta = with stdenv.lib; {
+      description = "Adds read support for excel files to agate";
+      homepage    = "https://github.com/wireservice/agate-excel";
+      license     = licenses.mit;
+      maintainers = with maintainers; [ vrthra ];
+    };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45307356282..1ff8f7d7d09 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -120,23 +120,7 @@ in {
 
   phonenumbers = callPackage ../development/python-modules/phonenumbers { };
 
-  agate-excel = buildPythonPackage rec {
-    name = "agate-excel-0.2.1";
-
-    meta = {
-      description = "Adds read support for excel files to agate";
-      homepage    = "https://github.com/wireservice/agate-excel";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    propagatedBuildInputs = with self; [ agate openpyxl xlrd ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/agate-excel/${name}.tar.gz";
-      sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7";
-    };
-  };
+  agate-excel = callPackage ../development/python-modules/agate-excel { };
 
   agate-sql = buildPythonPackage rec {
     name = "agate-sql-0.5.2";

From e13b240359d51af91400d6fb2c1c1ae720502926 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:12:09 -0700
Subject: [PATCH 15/20] agate-sql: refactor

---
 .../python-modules/agate-sql/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +---------------
 2 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/agate-sql/default.nix

diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
new file mode 100644
index 00000000000..0167b40ea43
--- /dev/null
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "agate-sql";
+    version = "0.5.2";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14";
+    };
+
+    propagatedBuildInputs = [ agate sqlalchemy ];
+
+    meta = with stdenv.lib; {
+      description = "Adds SQL read/write support to agate.";
+      homepage    = https://github.com/wireservice/agate-sql;
+      license     = with licenses; [ mit ];
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ff8f7d7d09..aeee6b08eb7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -122,23 +122,7 @@ in {
 
   agate-excel = callPackage ../development/python-modules/agate-excel { };
 
-  agate-sql = buildPythonPackage rec {
-    name = "agate-sql-0.5.2";
-
-    meta = {
-      description = "Adds SQL read/write support to agate.";
-      homepage    = https://github.com/wireservice/agate-sql;
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    propagatedBuildInputs = with self; [ agate sqlalchemy ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/agate-sql/${name}.tar.gz";
-      sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14";
-    };
-  };
+  agate-sql = callPackage ../development/python-modules/agate-sql { };
 
   ansicolor = buildPythonPackage rec {
     name = "ansicolor-${version}";

From b94706926b984001f257363ac8561bf614de0af3 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:13:50 -0700
Subject: [PATCH 16/20] dbf: refactor

---
 .../python-modules/dbf/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +---------------
 2 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/dbf/default.nix

diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
new file mode 100644
index 00000000000..2343ea2918b
--- /dev/null
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchPypi, buildPythonPackage, aenum, isPy3k }:
+
+buildPythonPackage rec {
+    pname = "dbf";
+    version = "0.96.8";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1";
+    };
+
+    propagatedBuildInputs = [ aenum ];
+
+    doCheck = !isPy3k;
+    # tests are not yet ported.
+    # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w
+
+    meta = with stdenv.lib; {
+      description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
+      homepage    = "https://pypi.python.org/pypi/dbf";
+      license     = licenses.bsd2;
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aeee6b08eb7..5d05ea6ef44 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -157,27 +157,7 @@ in {
 
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
 
-  dbf = buildPythonPackage rec {
-    name = "dbf-0.96.8";
-
-    propagatedBuildInputs = [ self.aenum ];
-
-    doCheck = false;
-    # (only) on python3 the unittest loader (loadTestsFromName(submodule)) fails
-
-    meta = {
-      description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
-      homepage    = "https://pypi.python.org/pypi/dbf";
-      license     = licenses.bsd2;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dbf/${name}.tar.gz";
-      sha256 = "1z8n7s4cka6x9ybh4qpfhj51v2qrk38h2f06npizzhm0hmn6r3v1";
-    };
-  };
-
+  dbf = callPackage ../development/python-modules/dbf { };
 
   dbfread = buildPythonPackage rec {
     name = "dbfread-2.0.5";

From 2b56afea4d295a4d055ed4d5418790da5885376f Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:14:50 -0700
Subject: [PATCH 17/20] dbfread: refactor

---
 .../python-modules/dbfread/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +---------------
 2 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/dbfread/default.nix

diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix
new file mode 100644
index 00000000000..6bbc4775605
--- /dev/null
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "dbfread";
+    version = "2.0.5";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Read DBF Files with Python";
+      homepage    = http://dbfread.readthedocs.org/;
+      license     = with licenses; [ mit ];
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d05ea6ef44..03958bc9d7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -159,21 +159,7 @@ in {
 
   dbf = callPackage ../development/python-modules/dbf { };
 
-  dbfread = buildPythonPackage rec {
-    name = "dbfread-2.0.5";
-
-    meta = {
-      description = "Read DBF Files with Python";
-      homepage    = "http://dbfread.readthedocs.org/";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dbfread/${name}.tar.gz";
-      sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93";
-    };
-  };
+  dbfread = callPackage ../development/python-modules/dbfread { };
 
   dkimpy = callPackage ../development/python-modules/dkimpy { };
 

From 0ef0a4ab5e56c797bc7fe47699b6910f217b1bf7 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:16:23 -0700
Subject: [PATCH 18/20] pytimeparse: refactor

---
 .../python-modules/pytimeparse/default.nix    | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-----------------
 2 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytimeparse/default.nix

diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix
new file mode 100644
index 00000000000..ce5ff058664
--- /dev/null
+++ b/pkgs/development/python-modules/pytimeparse/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, nose }:
+
+buildPythonPackage rec {
+    pname = "pytimeparse";
+    version = "1.1.6";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl";
+    };
+
+    propagatedBuildInputs = [ nose ];
+
+    meta = with stdenv.lib; {
+      description = "A small Python library to parse various kinds of time expressions";
+      homepage    = "https://github.com/wroberts/pytimeparse";
+      license     = licenses.mit;
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03958bc9d7f..6f46ee91d63 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -318,25 +318,7 @@ in {
 
   python-stdnum = callPackage ../development/python-modules/python-stdnum { };
 
-  pytimeparse = buildPythonPackage rec {
-    pname = "pytimeparse";
-    version = "1.1.6";
-    name = "${pname}-${version}";
-
-    meta = {
-      description = "A small Python library to parse various kinds of time expressions";
-      homepage    = "https://github.com/wroberts/pytimeparse";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ vrthra ];
-    };
-
-    propagatedBuildInputs = with self; [ nose ];
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl";
-    };
-  };
+  pytimeparse =  callPackage ../development/python-modules/pytimeparse { };
 
   PyWebDAV = callPackage ../development/python-modules/pywebdav { };
 

From 14d951c46fc400c3aae80ac28f35213d28804472 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:17:48 -0700
Subject: [PATCH 19/20] python-slugify: refactor

---
 .../python-modules/python-slugify/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +----------------
 2 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-slugify/default.nix

diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
new file mode 100644
index 00000000000..03c37f7a6c4
--- /dev/null
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, unidecode, regex, isPy3k }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "python-slugify";
+    version = "1.2.4";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp";
+    };
+    doCheck = !isPy3k;
+    # (only) on python3 unittest loader (loadTestsFromModule) fails
+
+    propagatedBuildInputs = [ unidecode regex ];
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/un33k/python-slugify;
+      description = "A Python Slugify application that handles Unicode";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ vrthra ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f46ee91d63..e08b0d502ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1488,27 +1488,7 @@ in {
     };
   }));
 
-  python-slugify = buildPythonPackage rec {
-    name = "python-slugify-${version}";
-    version = "1.2.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-slugify/${name}.tar.gz";
-      sha256 = "097qllxys22kghcv2a5jcc1zdlr9zzqayvk6ywavsv8wgbgqb8sp";
-    };
-    doCheck = false;
-    # (only) on python3 unittest loader (loadTestsFromModule) fails
-
-    propagatedBuildInputs = with self; [ unidecode regex ];
-
-    meta = with stdenv.lib; {
-      homepage = https://github.com/un33k/python-slugify;
-      description = "A Python Slugify application that handles Unicode";
-      license = licenses.mit;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ vrthra ];
-    };
-  };
+  python-slugify = callPackage ../development/python-modules/python-slugify { };
 
   awesome-slugify = buildPythonPackage rec {
     name = "awesome-slugify-${version}";

From 5762985302e4947529ec09ad185f9403f8f90a44 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 2 May 2017 21:18:57 -0700
Subject: [PATCH 20/20] csvkit: refactor

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

diff --git a/pkgs/development/python-modules/csvkit/default.nix b/pkgs/development/python-modules/csvkit/default.nix
new file mode 100644
index 00000000000..bfabf4376e7
--- /dev/null
+++ b/pkgs/development/python-modules/csvkit/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchPypi, buildPythonPackage,
+  dateutil, dbf, xlrd, sqlalchemy, openpyxl,
+ agate-excel, agate-dbf, agate-sql, isPy3k }:
+
+buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "csvkit";
+    version = "1.0.2";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
+    };
+
+    propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl
+      agate-excel agate-dbf agate-sql ];
+
+    doCheck = !isPy3k;
+    # (only) python 3 we had 9 failures and 57 errors out of a much larger
+    # number of tests.
+
+    meta = with stdenv.lib; {
+      description = "A library of utilities for working with CSV, the king of tabular file formats";
+      maintainers = with maintainers; [ vrthra ];
+      license = with licenses; [ mit ];
+      homepage = https://github.com/wireservice/csvkit;
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e08b0d502ad..554e5ac468c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2433,29 +2433,7 @@ in {
 
   csscompressor = callPackage ../development/python-modules/csscompressor.nix {};
 
-  csvkit = buildPythonPackage rec {
-    name = "csvkit-${version}";
-    version = "1.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/csvkit/${name}.tar.gz";
-      sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
-    };
-
-    propagatedBuildInputs = with self; [ dateutil dbf xlrd sqlalchemy openpyxl
-      agate-excel agate-dbf agate-sql ];
-
-    doCheck = false;
-    # (only) python 3 we had 9 failures and 57 errors out of a much larger
-    # number of tests.
-
-    meta = {
-      description = "A library of utilities for working with CSV, the king of tabular file formats";
-      maintainers = with maintainers; [ vrthra ];
-      license = licenses.mit;
-      homepage = "https://github.com/wireservice/csvkit";
-    };
-  };
+  csvkit =  callPackage ../development/python-modules/csvkit { };
 
   cx_Freeze = buildPythonPackage rec {
     name = "cx_freeze-${version}";