Merge pull request #211714 from bcdarwin/update-python3-dcmstack

pkgs/development/python-modules/dcmstack/default.nix

@@ -1,34 +1,32 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, pythonAtLeast
-, nose
+, pythonOlder
+, pytestCheckHook
 , nibabel
 , pydicom
+, pylibjpeg-libjpeg
 }:
 
 buildPythonPackage rec {
   pname = "dcmstack";
-  version = "0.8";
-
-  disabled = pythonAtLeast "3.8";
-  # https://github.com/moloney/dcmstack/issues/67
+  version = "0.9";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "moloney";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs=";
   };
 
-  propagatedBuildInputs = [ nibabel pydicom ];
+  propagatedBuildInputs = [
+    nibabel
+    pydicom
+    pylibjpeg-libjpeg
+  ];
 
-  checkInputs = [ nose ];
-  checkPhase = ''
-    runHook preCheck
-    nosetests
-    runHook postCheck
-  '';
+  checkInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     homepage = "https://github.com/moloney/dcmstack";

pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, cython
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "pylibjpeg-libjpeg";
+  version = "1.3.3";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "pydicom";
+    repo = pname;
+    rev = "refs/tags/v.${version}";
+    hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cython];
+
+  propagatedBuildInputs = [ numpy ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+  doCheck = false;  # tests try to import 'libjpeg.data', which errors
+
+  pythonImportsCheck = [
+    "libjpeg"
+  ];
+
+  meta = with lib; {
+    description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg";
+    homepage = "https://github.com/pydicom/pylibjpeg-libjpeg";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ bcdarwin ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -8199,6 +8199,8 @@ self: super: with self; {
     inherit (pkgs) libusb1;
   };
 
+  pylibjpeg-libjpeg = callPackage ../development/python-modules/pylibjpeg-libjpeg { };
+
   pyliblo = callPackage ../development/python-modules/pyliblo { };
 
   pylibmc = callPackage ../development/python-modules/pylibmc { };