diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 0f044c6e28b5..5443545d5af5 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -2,20 +2,23 @@ lib, fetchFromGitHub, buildPythonPackage, - pytest, + setuptools, + pytestCheckHook, numpy, scipy, - matplotlib, + bumps, docutils, - pyopencl, + matplotlib, opencl-headers, + pycuda, + pyopencl, pythonOlder, }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.7"; - format = "setuptools"; + version = "1.0.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,25 +26,34 @@ buildPythonPackage rec { owner = "SasView"; repo = "sasmodels"; rev = "refs/tags/v${version}"; - hash = "sha256-GZQYVvQ4bEBizTmJ+o5fIfGr8gn2/4uD3PxIswEjzSE="; + hash = "sha256-fa6/13z11AuTRItZOEmTbjpU1aT6Ur7evi6UvVvXQck="; }; + build-system = [ setuptools ]; + buildInputs = [ opencl-headers ]; - propagatedBuildInputs = [ - docutils - matplotlib + dependencies = [ numpy scipy - pyopencl ]; - # Note: the 1.0.5 release should be compatible with pytest6, so this can - # be set back to 'pytest' at that point - nativeCheckInputs = [ pytest ]; + optional-dependencies = { + full = [ + docutils + bumps + matplotlib + # columnize + ]; + server = [ bumps ]; + opencl = [ pyopencl ]; + cuda = [ pycuda ]; + }; - checkPhase = '' - HOME=$(mktemp -d) py.test -c ./pytest.ini + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; + + preCheck = '' + export HOME=$TMPDIR ''; pythonImportsCheck = [ "sasmodels" ];