From 7bd29be23bb81d928dc358a6488d96bc2d3e2611 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 06:14:20 +0000 Subject: [PATCH 1/2] python310Packages.dbf: 0.99.1 -> 0.99.2 --- pkgs/development/python-modules/dbf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index b5b6f277fd6..1bf922012d3 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.1"; + version = "0.99.2"; src = fetchPypi { inherit pname version; - sha256 = "4ed598a3866dfe7761b8099cf53ab44cb6ed5e4a7dbffb0da8c67a4af8d62fc5"; + sha256 = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; }; propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34; From 97ed4e85eab62532cb8fc3bc6e2cdc446b2f8bbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 10:03:26 +0200 Subject: [PATCH 2/2] python310Packages.dbf: disable on older Python releases - add pythonImportsCheck - run tests --- .../python-modules/dbf/default.nix | 51 +++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 1bf922012d3..6c85d0def6e 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -1,28 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: +{ lib +, fetchPypi +, buildPythonPackage +, aenum +, pythonOlder +, python +}: buildPythonPackage rec { - pname = "dbf"; - version = "0.99.2"; + pname = "dbf"; + version = "0.99.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; - }; + disabled = pythonOlder "3.7"; - propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34; + src = fetchPypi { + inherit pname version; + hash = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; + }; - doCheck = !isPy3k; - # tests are not yet ported. - # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w + propagatedBuildInputs = [ + aenum + ]; - checkPhase = '' - ${python.interpreter} dbf/test.py - ''; + checkPhase = '' + ${python.interpreter} dbf/test.py + ''; - meta = with 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 ]; - }; + pythonImportsCheck = [ + "dbf" + ]; + + meta = with lib; { + description = "Module for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; + homepage = "https://github.com/ethanfurman/dbf"; + license = licenses.bsd2; + maintainers = with maintainers; [ vrthra ]; + }; }