From f95356f44eebb7b2dd64a2a2e661921ea1eeb008 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 May 2022 01:11:54 +0000 Subject: [PATCH 1/2] python310Packages.periodictable: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/periodictable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 7c08468c03f..8a7770f3021 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "periodictable"; - version = "1.6.0"; + version = "1.6.1"; propagatedBuildInputs = [numpy pyparsing]; src = fetchPypi { inherit pname version; - sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23"; + sha256 = "sha256-fFAcn3PXex+yjLUehbKEKcLESpnOPRJ0iUVkxy1xJgM="; }; checkInputs = [ pytest-cov pytestCheckHook ]; From c8310399496fdf9207c066dbfdf3f3394aa9b4ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 20 May 2022 10:37:16 +0200 Subject: [PATCH 2/2] python310Packages.periodictable: add pythonImportsCheck - disable on older Python release - remove coverage - update meta --- .../python-modules/periodictable/default.nix | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 8a7770f3021..89a293b75f4 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -1,22 +1,41 @@ -{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }: +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, pyparsing +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "periodictable"; version = "1.6.1"; + format = "setuptools"; - propagatedBuildInputs = [numpy pyparsing]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fFAcn3PXex+yjLUehbKEKcLESpnOPRJ0iUVkxy1xJgM="; + hash = "sha256-fFAcn3PXex+yjLUehbKEKcLESpnOPRJ0iUVkxy1xJgM="; }; - checkInputs = [ pytest-cov pytestCheckHook ]; + propagatedBuildInputs = [ + numpy + pyparsing + ]; - meta = { - homepage = "https://www.reflectometry.org/danse/software.html"; - description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ rprospero ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "periodictable" + ]; + + meta = with lib; { + description = "Extensible periodic table of the elements"; + homepage = "https://github.com/pkienzle/periodictable"; + license = licenses.publicDomain; + maintainers = with maintainers; [ rprospero ]; }; }