From 2c038718acf9c690d83e856149a50597d6f6d7cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Nov 2023 22:29:45 +0000
Subject: [PATCH 1/4] python310Packages.tableauserverclient: 0.26 -> 0.28

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

diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix
index c473a3755fe0..369b956029bc 100644
--- a/pkgs/development/python-modules/tableauserverclient/default.nix
+++ b/pkgs/development/python-modules/tableauserverclient/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "tableauserverclient";
-  version = "0.26";
+  version = "0.28";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-vn7A7n0Z4kTtrm8MEoUJiv94K3qA/4Kx8lElhDM/LlI=";
+    sha256 = "sha256-jSblDVkuuBBZ7GmPKUYji8wtRoPS7g8r6Ye9EpnjvKA=";
   };
 
   propagatedBuildInputs = [ defusedxml requests packaging ];

From 2a1ba96040a8f30592287af28920c2e177829f3b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 12 Nov 2023 13:52:19 +0100
Subject: [PATCH 2/4] python310Packages.tableauserverclient: update meta

---
 .../python-modules/tableauserverclient/default.nix  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix
index 369b956029bc..4dc0ead10797 100644
--- a/pkgs/development/python-modules/tableauserverclient/default.nix
+++ b/pkgs/development/python-modules/tableauserverclient/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-jSblDVkuuBBZ7GmPKUYji8wtRoPS7g8r6Ye9EpnjvKA=";
+    hash = "sha256-jSblDVkuuBBZ7GmPKUYji8wtRoPS7g8r6Ye9EpnjvKA=";
   };
 
   propagatedBuildInputs = [ defusedxml requests packaging ];
@@ -26,10 +26,11 @@ buildPythonPackage rec {
 
   doCheck = false; # it attempts to create some file artifacts and fails
 
-  meta = {
-    description = "A Python module for working with the Tableau Server REST API.";
-    homepage = "https://pypi.org/project/tableauserverclient/";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+  meta = with lib; {
+    description = "Module for working with the Tableau Server REST API";
+    homepage = "https://github.com/tableau/server-client-python";
+    changelog = "https://github.com/tableau/server-client-python/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

From d663d69229895240066d20820d569ad6ad980f38 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 12 Nov 2023 13:55:20 +0100
Subject: [PATCH 3/4] python310Packages.tableauserverclient: modernize

---
 .../tableauserverclient/default.nix           | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix
index 4dc0ead10797..f87c975f5a2c 100644
--- a/pkgs/development/python-modules/tableauserverclient/default.nix
+++ b/pkgs/development/python-modules/tableauserverclient/default.nix
@@ -1,30 +1,39 @@
 { lib
 , buildPythonPackage
-, python
 , fetchPypi
 , defusedxml
 , requests
 , packaging
 , requests-mock
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "tableauserverclient";
   version = "0.28";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-jSblDVkuuBBZ7GmPKUYji8wtRoPS7g8r6Ye9EpnjvKA=";
   };
 
-  propagatedBuildInputs = [ defusedxml requests packaging ];
+  propagatedBuildInputs = [
+    defusedxml
+    requests
+    packaging
+  ];
 
-  checkInputs = [ requests-mock ];
+  nativeCheckInputs = [
+    requests-mock
+    pytestCheckHook
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  doCheck = false; # it attempts to create some file artifacts and fails
+  # Tests attempt to create some file artifacts and fails
+  doCheck = false;
 
   meta = with lib; {
     description = "Module for working with the Tableau Server REST API";

From 2eb5878bf05a8f898b1a062be74d6bf4b7151f99 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 12 Nov 2023 13:55:55 +0100
Subject: [PATCH 4/4] python310Packages.tableauserverclient: add
 pythonImportsCheck

---
 .../python-modules/tableauserverclient/default.nix            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix
index f87c975f5a2c..6bcdde6c7390 100644
--- a/pkgs/development/python-modules/tableauserverclient/default.nix
+++ b/pkgs/development/python-modules/tableauserverclient/default.nix
@@ -35,6 +35,10 @@ buildPythonPackage rec {
   # Tests attempt to create some file artifacts and fails
   doCheck = false;
 
+  pythonImportsCheck = [
+    "tableauserverclient"
+  ];
+
   meta = with lib; {
     description = "Module for working with the Tableau Server REST API";
     homepage = "https://github.com/tableau/server-client-python";