Merge pull request #85171 from bcdarwin/python3-mayavi

python3Packages.mayavi: update from Python 2 to Python 3 (and switch from wxPython to pyqt5)

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

@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, buildPythonPackage, fetchpatch
 , configobj, six, traitsui
 , nose, tables, pandas
 }:
@@ -12,6 +12,13 @@ buildPythonPackage rec {
     sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6";
   };
 
+  # PyTables issue; should be merged in next post-4.5.0 release (#117)
+  patches = [ (fetchpatch {
+      url = "https://github.com/enthought/apptools/commit/3734289d1a0ebd8513fa67f75288add31ed0113c.patch";
+      sha256 = "001012q1ib5cbib3nq1alh9ckzj588bfrywr8brkd1f6y1pgvngk";
+    })
+  ];
+
   propagatedBuildInputs = [ configobj six traitsui ];
 
   checkInputs = [

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

@@ -1,15 +1,18 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, fetchPypi, fetchpatch, isPy27
+, buildPythonPackage
 , traits, apptools
-, ipykernel
+, python, ipykernel, ipython
 }:
 
 buildPythonPackage rec {
   pname = "envisage";
-  version = "4.7.2";
+  version = "4.9.2";
+
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jb5nw0w9x97jij0hd3d7kfzcj58r1cqmplmdy56bj11dyc4wyc9";
+    sha256 = "1srjmkhnz84nz5jd72vdsnc4fn7dd9jr8nyf3hzk6yx1dsn815gd";
   };
 
   propagatedBuildInputs = [ traits apptools ];
@@ -18,16 +21,26 @@ buildPythonPackage rec {
     export HOME=$PWD/HOME
   '';
 
+  # fix a test failure; should be merged in next release
+  patches = [ (fetchpatch {
+    url = "https://github.com/enthought/envisage/pull/248/commits/7b6d2dd615d5cb7455b200eb8f37e030bbf4df9e.patch";
+    sha256 = "0a3dmbpxwsn1bkjcjv9v7b751rcmppj6hc9wcgiayg4l9r2nrvyh";
+  }) ];
+
   checkInputs = [
-    ipykernel
+    ipykernel ipython
   ];
 
-  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m unittest
+    runHook postCheck
+  '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'";
     homepage = "https://github.com/enthought/envisage";
-    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    maintainers = with lib.maintainers; [ knedlsepp ];
     license = licenses.bsdOriginal;
   };
 }

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

@@ -1,37 +1,45 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, buildPythonPackage, isPy27, fetchPypi, wrapQtAppsHook
-, wxPython, pygments, numpy, vtk, traitsui, envisage, apptools
+, pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5
-, nose, mock
-, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "mayavi";
   version = "4.7.1";
 
+  disabled = isPy27;
+
   src = fetchPypi {
     inherit pname version;
     extension = "tar.bz2";
     sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy";
   };
 
-  # Discovery of 'vtk' in setuptools is not working properly, due to a missing
-  # .egg-info in the vtk package. It does however import and run just fine.
   postPatch = ''
+    # Discovery of 'vtk' in setuptools is not working properly, due to a missing
+    # .egg-info in the vtk package. It does however import and run just fine.
     substituteInPlace mayavi/__init__.py --replace "'vtk'" ""
+
+    # building the docs fails with the usual Qt xcb error, so skip:
+    substituteInPlace setup.py \
+      --replace "build.build.run(self)" "build.build.run(self); return"
   '';
 
-  propagatedBuildInputs = [ wxPython pygments numpy vtk traitsui envisage apptools ];
+  nativeBuildInputs = [ wrapQtAppsHook ];
 
-  checkInputs = [ nose mock ];
+  propagatedBuildInputs = [
-
+    pyface pygments numpy vtk traitsui envisage apptools pyqt5
-  disabled = isPy3k; # TODO: This would need pyqt5 instead of wxPython
+  ];
 
   doCheck = false; # Needs X server
 
-  meta = with stdenv.lib; {
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
     description = "3D visualization of scientific data in Python";
     homepage = "https://github.com/enthought/mayavi";
-    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
+    maintainers = with maintainers; [ knedlsepp ];
     license = licenses.bsdOriginal;
   };
 }

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

@@ -1,5 +1,5 @@
 { stdenv, fetchPypi, buildPythonPackage
-, setuptools, six, traits, wxPython
+, setuptools, six, traits
 }:
 
 buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "1g2g3za64rfffbivlihbf5njrqbv63ln62rv9d8fi1gcrgaw6akw";
   };
 
-  propagatedBuildInputs = [ setuptools six traits wxPython ];
+  propagatedBuildInputs = [ setuptools six traits ];
 
   doCheck = false; # Needs X server
 

pkgs/top-level/python-packages.nix

@@ -4378,7 +4378,10 @@ in {
 
   maya = callPackage ../development/python-modules/maya { };
 
-  mayavi = callPackage ../development/python-modules/mayavi { };
+  mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi {
+    inherit buildPythonPackage isPy27 fetchPypi;
+    inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5;
+  };
 
   mccabe = callPackage ../development/python-modules/mccabe { };