diff options
5 files changed, 45 insertions, 39 deletions
diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 2da21db1eb145..56cd051ecf4cb 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -5,6 +5,7 @@ , sphinx , ipywidgets , pythonOlder +, nbconvert }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "37fc9408385c45326ac79ca0452fbd7ae2bf0e97842d626d2844d4830e30aaf2"; }; - propagatedBuildInputs = [ nbformat sphinx ipywidgets ]; + propagatedBuildInputs = [ nbconvert nbformat sphinx ipywidgets ]; doCheck = false; diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 2cb7d06b646a7..dd8368676d1b7 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -10,6 +10,7 @@ , jinja2 , tornado , pyzmq +, ipykernel , ipython_genutils , traitlets , jupyter_core @@ -62,6 +63,7 @@ buildPythonPackage rec { ]; checkInputs = [ + ipykernel pytestCheckHook pytest-tornasync requests diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 69aa660f1425d..9b85586f7d9be 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -1,25 +1,19 @@ -{ lib +{ beautifulsoup4 +, bleach , buildPythonPackage +, defusedxml , fetchPypi -, pytestCheckHook -, glibcLocales -, entrypoints -, bleach -, mistune -, nbclient +, ipywidgets , jinja2 -, pygments -, traitlets -, jupyter_core , jupyterlab-pygments -, nbformat -, ipykernel +, lib +, markupsafe +, mistune +, nbclient , pandocfilters -, tornado -, jupyter-client -, defusedxml +, pyppeteer +, pytestCheckHook , tinycss2 -, beautifulsoup4 }: buildPythonPackage rec { @@ -42,37 +36,38 @@ buildPythonPackage rec { substituteAllInPlace ./nbconvert/exporters/templateexporter.py ''; - checkInputs = [ pytestCheckHook glibcLocales ]; - propagatedBuildInputs = [ - entrypoints bleach mistune jinja2 pygments traitlets - jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client - defusedxml tinycss2 beautifulsoup4 - nbclient + beautifulsoup4 + bleach + defusedxml + jinja2 jupyterlab-pygments + markupsafe + mistune + nbclient + pandocfilters + tinycss2 ]; - # disable preprocessor tests for ipython 7 - # see issue https://github.com/jupyter/nbconvert/issues/898 preCheck = '' - export LC_ALL=en_US.UTF-8 - HOME=$(mktemp -d) + export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ - "--ignore=nbconvert/preprocessors/tests/test_execute.py" - # can't resolve template paths within sandbox - "--ignore=nbconvert/tests/base.py" - "--ignore=nbconvert/tests/test_nbconvertapp.py" + checkInputs = [ + ipywidgets + pyppeteer + pytestCheckHook ]; + pytestFlagsArray = [ + # DeprecationWarning: Support for bleach <5 will be removed in a future version of nbconvert + "-W ignore::DeprecationWarning" + ]; disabledTests = [ + # Attempts network access (Failed to establish a new connection: [Errno -3] Temporary failure in name resolution) "test_export" - "test_webpdf_without_chromium" - #"test_cell_tag_output" - #"test_convert_from_stdin" - #"test_convert_full_qualified_name" + "test_webpdf_with_chromium" ]; # Some of the tests use localhost networking. diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index b97d51496521c..c9e2ff020f827 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -7,6 +7,7 @@ , nbconvert , markdown , isPy3k +, ipykernel }: buildPythonPackage rec { @@ -21,7 +22,7 @@ buildPythonPackage rec { disabled = !isPy3k; buildInputs = [ mock pkgs.glibcLocales ]; - propagatedBuildInputs = [ matplotlib nbconvert markdown ]; + propagatedBuildInputs = [ ipykernel matplotlib nbconvert markdown ]; # fails due to trying to run CSS as test doCheck = false; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 5b4f535563c22..563e792850d50 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -8,13 +8,20 @@ buildPythonPackage rec { pname = "widgetsnbextension"; version = "3.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; + hash = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; }; - propagatedBuildInputs = [ notebook ]; + # setup.py claims to require notebook, but the source doesn't have any imports + # in it. + postPatch = '' + substituteInPlace setup.py --replace "'notebook>=4.4.1'," "" + ''; + + propagatedBuildInputs = [ ]; # No tests in archive doCheck = false; |