From dd28110140e39552eb11eeef37e0afcbd9d64bb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Dec 2022 18:41:00 +0000
Subject: [PATCH 1/3] python39Packages.tablib: 3.2.1 -> 3.3.0

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

diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index ae0217b0ebdc..59e0f0454bb4 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "tablib";
-  version = "3.2.1";
+  version = "3.3.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-pX8ncLjCJf6+wcseZQEqac8w3Si+gQ4P+Y0CR2jH0PE=";
+    sha256 = "sha256-EeAqb4HSVuBmaHfYOXly0QMCMHpUwE/XFX6S+vdAyxA=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 8fd8a3aba19aa75d23dc4becf51145ef439a0870 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 Dec 2022 10:21:04 +0100
Subject: [PATCH 2/3] python39Packages.tablib: update disabled

- remove pytest-cov
- use disabledTestPaths
---
 .../python-modules/tablib/default.nix         | 50 ++++++++++++++-----
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index 59e0f0454bb4..25631f3b4cb0 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -1,7 +1,7 @@
-{ buildPythonPackage
-, lib
+{ lib
+, buildPythonPackage
 , fetchPypi
-, isPy27
+, pythonOlder
 , odfpy
 , openpyxl
 , pandas
@@ -16,27 +16,53 @@
 
 buildPythonPackage rec {
   pname = "tablib";
-  version = "3.3.0";
-  disabled = isPy27;
+  version = "3.2.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-EeAqb4HSVuBmaHfYOXly0QMCMHpUwE/XFX6S+vdAyxA=";
+    hash = "sha256-pX8ncLjCJf6+wcseZQEqac8w3Si+gQ4P+Y0CR2jH0PE=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ];
-  checkInputs = [ pytestCheckHook pytest-cov unicodecsv pandas ];
+  postPatch = ''
+    substituteInPlace pytest.ini \
+      --replace " --cov=tablib --cov=tests --cov-report xml --cov-report term --cov-report html" ""
+  '';
 
-  # test_tablib needs MarkupPy, which isn't packaged yet
-  pytestFlagsArray = [ "--ignore=tests/test_tablib.py" ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
-  pythonImportsCheck = [ "tablib" ];
+  propagatedBuildInputs = [
+    odfpy
+    openpyxl
+    pyyaml
+    xlrd
+    xlwt
+  ];
+
+  checkInputs = [
+    pandas
+    pytestCheckHook
+    unicodecsv
+  ];
+
+  disabledTestPaths = [
+    # test_tablib needs MarkupPy, which isn't packaged yet
+    "tests/test_tablib.py"
+  ];
+
+  pythonImportsCheck = [
+    "tablib"
+  ];
 
   meta = with lib; {
     description = "Format-agnostic tabular dataset library";
     homepage = "https://tablib.readthedocs.io/";
     changelog = "https://github.com/jazzband/tablib/raw/v${version}/HISTORY.md";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

From 8ccd98536a523a83273308c874a52af097dcc9f4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 20 Dec 2022 10:25:50 +0100
Subject: [PATCH 3/3] python310Packages.tablib: use optional-dependencies

---
 .../python-modules/tablib/default.nix         | 47 +++++++++++++++----
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index 25631f3b4cb0..f07691abdca7 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -1,14 +1,14 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pythonOlder
 , odfpy
 , openpyxl
 , pandas
-, setuptools-scm
 , pytestCheckHook
-, pytest-cov
+, pythonOlder
 , pyyaml
+, setuptools-scm
+, tabulate
 , unicodecsv
 , xlrd
 , xlwt
@@ -35,13 +35,40 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
-    odfpy
-    openpyxl
-    pyyaml
-    xlrd
-    xlwt
-  ];
+  passthru.optional-dependencies = {
+    all = [
+      # markuppy
+      odfpy
+      openpyxl
+      pandas
+      pyyaml
+      tabulate
+      xlrd
+      xlwt
+    ];
+    cli = [
+      tabulate
+    ];
+    html = [
+      # markuppy
+    ];
+    ods = [
+      odfpy
+    ];
+    pandas = [
+      pandas
+    ];
+    xls = [
+      xlrd
+      xlwt
+    ];
+    xlsx = [
+      openpyxl
+    ];
+    yaml = [
+      pyyaml
+    ];
+  };
 
   checkInputs = [
     pandas