sasview: 5.0.4 -> 5.0.6
Diff: https://github.com/SasView/sasview/compare/refs/tags/v5.0.4...v5.0.6
This commit is contained in:
@@ -1,30 +1,21 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sasview";
|
||||
version = "5.0.4";
|
||||
version = "5.0.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SasView";
|
||||
repo = "sasview";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TjcchqA6GCvkr59ZgDuGglan2RxLp+aMjJk28XhvoiY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cwP9VuvO4GPlbAxCqw31xISTi9NoF5RoBQmjWusrnzc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix `asscalar` numpy API removal.
|
||||
# See https://github.com/SasView/sasview/pull/2178
|
||||
(fetchpatch {
|
||||
url = "https://github.com/SasView/sasview/commit/b1ab08c2a4e8fdade7f3e4cfecf3dfec38b8f3c5.patch";
|
||||
hash = "sha256-IH8g4XPziVAnkmBdzLH1ii8vN6kyCmOgrQlH2HEbm5o=";
|
||||
})
|
||||
];
|
||||
|
||||
# AttributeError: module 'numpy' has no attribute 'float'.
|
||||
postPatch = ''
|
||||
substituteInPlace src/sas/sascalc/pr/p_invertor.py \
|
||||
@@ -33,6 +24,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.pyqt5
|
||||
python3.pkgs.setuptools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
@@ -66,12 +58,20 @@ python3.pkgs.buildPythonApplication rec {
|
||||
unittest-xml-reporting
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "test" ];
|
||||
pytestFlagsArray = [
|
||||
"test"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# NoKnownLoaderException
|
||||
"test_invalid_cansas"
|
||||
"test_data_reader_exception"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.sasview.org";
|
||||
description = "Fitting and data analysis for small angle scattering data";
|
||||
maintainers = with maintainers; [ rprospero ];
|
||||
homepage = "https://www.sasview.org";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ rprospero ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user