Merge pull request #112056 from rmcgibbo/nbsphinx

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

@@ -1,4 +1,12 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, nbconvert
+, pytestCheckHook
+, requests
+, responses
+}:
 
 buildPythonPackage rec {
   pname = "nbconflux";
@@ -14,11 +22,13 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ nbconvert requests ];
 
-  checkInputs = [ pytest responses ];
+  checkInputs = [ pytestCheckHook responses ];
 
-  checkPhase = ''
-    pytest tests
-  '';
+  JUPYTER_PATH="${nbconvert}/share/jupyter";
+  disabledTests = [
+    "test_post_to_confluence"
+    "test_optional_components"
+  ];
 
   meta = with lib; {
     description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert";

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

@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "nbsphinx";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0";
+    sha256 = "19lf036h0d9ryqasrh91myhn3dq5zcw4rik9jy6sayq7l6irmm94";
   };
 
   propagatedBuildInputs = [
@@ -29,9 +29,13 @@ buildPythonPackage rec {
     traitlets
   ];
 
-  checkPhase = ''
-    ${python.interpreter} -m nbsphinx
-  '';
+  # The package has not tests
+  doCheck = false;
+
+  JUPYTER_PATH = "${nbconvert}/share/jupyter";
+  pythonImportsCheck = [
+    "nbsphinx"
+  ];
 
   disabled = !isPy3k;