From 86aeb9fc2326690fe8b3fa01d4f3232f964a03b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 11:15:08 +0000 Subject: [PATCH 1/2] python310Packages.gsd: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/gsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index c8647794e2c0..8ff7ceef0464 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.6.0"; + version = "2.6.1"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GVb05uy5HKIn+fARFBN+mK54y2CtFBM8At21VUFr7tc="; + sha256 = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; }; nativeBuildInputs = [ cython ]; From a8899fabffe6a798d14f3633b206a30228bef166 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Nov 2022 18:55:48 +0100 Subject: [PATCH 2/2] python310Packages.gsd: disable on older Python releases - add pythonImportsCheck --- .../python-modules/gsd/default.nix | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8ff7ceef0464..ab64a78c103f 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -1,27 +1,47 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, cython, numpy +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, numpy , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "2.6.1"; pname = "gsd"; - disabled = isPy27; + version = "2.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; + hash = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; }; - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy ]; + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gsd" + ]; + - checkInputs = [ pytestCheckHook ]; preCheck = '' pushd gsd/test ''; + postCheck = '' popd ''; @@ -30,6 +50,6 @@ buildPythonPackage rec { description = "General simulation data file format"; homepage = "https://github.com/glotzerlab/gsd"; license = licenses.bsd2; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; }