diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2024-02-19 23:25:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-19 23:25:08 +0100 |
commit | 49a2b28ca6f454ab2799945a7f164cc107bd6ee4 (patch) | |
tree | 50beab1bfc1924e17a28f7cbfedf4b3c4da2a5bc /pkgs/applications | |
parent | 183b71052e666b8ede327ca968f74e3d89b28fad (diff) | |
parent | 4646a0c7db64b2f886b1de82e42961b640896940 (diff) |
Merge pull request #289974 from fabaff/sasview-fix
sasview: 5.0.4 -> 5.0.6
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/science/misc/sasview/default.nix | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index ddc0cdfa4e5b8..e896b19ede837 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -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,21 @@ 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"; + changelog = "https://github.com/SasView/sasview/releases/tag/v${version}"; license = licenses.bsd3; + maintainers = with maintainers; [ rprospero ]; }; } |