From 58786e0ac1f49ef8eb824a63527af9896d1657ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 00:04:02 +0200 Subject: [PATCH 1/5] python310Packages.openpyxl: 3.1.1 -> 3.1.2 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index f8286a92a54..3159077f2cf 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.1.1"; + version = "3.1.2"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - hash = "sha256-8G1E4slzeBBovOXs+GCgm82xx/XOH6zV6aqCySyTrnI="; + hash = "sha256-pvWXdBjv87LVUA1U2dtQyCd6NoQ29OT43bG+NCKHAYQ="; }; nativeCheckInputs = [ pytest ]; From 367eb7b59ae41879e126655baffd0a0f4596ba7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 00:08:45 +0200 Subject: [PATCH 2/5] python310Packages.openpyxl: add changelog to meta --- pkgs/development/python-modules/openpyxl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 3159077f2cf..2383ea19d97 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; homepage = "https://openpyxl.readthedocs.org"; + changelog = "https://foss.heptapod.net/openpyxl/openpyxl/-/blob/${version}/doc/changes.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lihop ]; }; From 6e38489a88a99a6b41edbfa52393af70a85b33c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 00:12:13 +0200 Subject: [PATCH 3/5] python310Packages.openpyxl: disable on unsupported Python releases - add format --- pkgs/development/python-modules/openpyxl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 2383ea19d97..04a9b4cde34 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder , pytest , jdcal , et_xmlfile @@ -11,7 +11,9 @@ buildPythonPackage rec { pname = "openpyxl"; version = "3.1.2"; - disabled = isPy27; # 2.6.4 was final python2 release + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 938942a8060eb19c6f065f21bfa34d81d3f86499 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 00:12:55 +0200 Subject: [PATCH 4/5] python310Packages.openpyxl: update meta --- pkgs/development/python-modules/openpyxl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 04a9b4cde34..6d5dab3ecff 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { # https://bitbucket.org/openpyxl/openpyxl/issues/610 doCheck = false; - meta = { + meta = with lib; { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; homepage = "https://openpyxl.readthedocs.org"; changelog = "https://foss.heptapod.net/openpyxl/openpyxl/-/blob/${version}/doc/changes.rst"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lihop ]; + license = licenses.mit; + maintainers = with maintainers; [ lihop ]; }; } From 84245134332ce762aae4d242df3e0edc511d1221 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 29 Mar 2023 00:31:08 +0200 Subject: [PATCH 5/5] python310Packages.openpyxl: enable tests - add pythonImportsCheck - update description --- .../python-modules/openpyxl/default.nix | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 6d5dab3ecff..03a33ef26a6 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -1,11 +1,12 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, pytest -, jdcal , et_xmlfile +, fetchFromGitLab +, jdcal , lxml +, pillow +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -15,26 +16,31 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pvWXdBjv87LVUA1U2dtQyCd6NoQ29OT43bG+NCKHAYQ="; + src = fetchFromGitLab { + domain = "foss.heptapod.net"; + owner = "openpyxl"; + repo = "openpyxl"; + rev = version; + hash = "sha256-SWRbjA83AOLrfe6on2CSb64pH5EWXkfyYcTqWJNBEP0="; }; - nativeCheckInputs = [ pytest ]; - propagatedBuildInputs = [ jdcal et_xmlfile lxml ]; + propagatedBuildInputs = [ + jdcal + et_xmlfile + lxml + ]; - postPatch = '' - # LICENSE.rst is missing, and setup.cfg currently doesn't contain anything useful anyway - # This should likely be removed in the next update - rm setup.cfg - ''; + nativeCheckInputs = [ + pillow + pytestCheckHook + ]; - # Tests are not included in archive. - # https://bitbucket.org/openpyxl/openpyxl/issues/610 - doCheck = false; + pythonImportsCheck = [ + "openpyxl" + ]; meta = with lib; { - description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; + description = "Python library to read/write Excel 2010 xlsx/xlsm files"; homepage = "https://openpyxl.readthedocs.org"; changelog = "https://foss.heptapod.net/openpyxl/openpyxl/-/blob/${version}/doc/changes.rst"; license = licenses.mit;