From e9bcc61136ee0105a9e9fbba6b3c8f0ca9e6b620 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 18 Jan 2024 22:19:28 +0100
Subject: [PATCH] python312Packages.openpyxl: refactor

---
 .../python-modules/openpyxl/default.nix       | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index 82af53c55119..c0fc2ba78ec1 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -1,22 +1,19 @@
 { lib
 , buildPythonPackage
-, fetchFromGitLab
-, pythonOlder
-
-# dependencies
 , et-xmlfile
-
-# tests
+, fetchFromGitLab
 , lxml
 , pandas
 , pillow
 , pytestCheckHook
+, pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "openpyxl";
   version = "3.1.2";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -24,10 +21,14 @@ buildPythonPackage rec {
     domain = "foss.heptapod.net";
     owner = "openpyxl";
     repo = "openpyxl";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-SWRbjA83AOLrfe6on2CSb64pH5EWXkfyYcTqWJNBEP0=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     et-xmlfile
   ];
@@ -40,20 +41,24 @@ buildPythonPackage rec {
   ];
 
   pytestFlagsArray = [
-    # broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116
-    "--deselect=openpyxl/chart/tests/test_reader.py::test_read"
-    "--deselect=openpyxl/comments/tests/test_comment_reader.py::test_read_comments"
-    "--deselect=openpyxl/drawing/tests/test_spreadsheet_drawing.py::TestSpreadsheetDrawing::test_ignore_external_blip"
-    "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_from_xml"
-    "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_filenames"
-    "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_exts"
-    "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_from_complex"
-    "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_merge_named_styles"
-    "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_unprotected_cell"
-    "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_none_values"
-    "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_rgb_colors"
-    "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_named_styles"
-    "--deselect=openpyxl/workbook/external_link/tests/test_external.py::test_read_ole_link"
+    "-W"
+    "ignore::DeprecationWarning"
+  ];
+  disabledTests = [
+    # Tests broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116
+    "test_read"
+    "test_read_comments"
+    "test_ignore_external_blip"
+    "test_from_xml"
+    "test_filenames"
+    "test_exts"
+    "test_from_complex"
+    "test_merge_named_styles"
+    "test_unprotected_cell"
+    "test_none_values"
+    "test_rgb_colors"
+    "test_named_styles"
+    "test_read_ole_link"
   ];
 
   pythonImportsCheck = [