pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #171735 from samuela/samuela/nbconvert

python3Packages.nbconvert: clean up

authored by

Frederik Rietdijk and committed by
GitHub 750a5146 32bebf42

+45 -39
unified split
+2 -1
pkgs/development/python-modules/jupyter-sphinx/default.nix
··· 5 5 , sphinx 6 6 , ipywidgets 7 7 , pythonOlder 8 + , nbconvert 8 9 }: 9 10 10 11 buildPythonPackage rec { ··· 17 18 sha256 = "37fc9408385c45326ac79ca0452fbd7ae2bf0e97842d626d2844d4830e30aaf2"; 18 19 }; 19 20 20 - propagatedBuildInputs = [ nbformat sphinx ipywidgets ]; 21 + propagatedBuildInputs = [ nbconvert nbformat sphinx ipywidgets ]; 21 22 22 23 doCheck = false; 23 24
+2
pkgs/development/python-modules/jupyter_server/default.nix
··· 10 10 , jinja2 11 11 , tornado 12 12 , pyzmq 13 + , ipykernel 13 14 , ipython_genutils 14 15 , traitlets 15 16 , jupyter_core ··· 62 63 ]; 63 64 64 65 checkInputs = [ 66 + ipykernel 65 67 pytestCheckHook 66 68 pytest-tornasync 67 69 requests
+30 -35
pkgs/development/python-modules/nbconvert/default.nix
··· 1 - { lib 1 + { beautifulsoup4 2 + , bleach 2 3 , buildPythonPackage 4 + , defusedxml 3 5 , fetchPypi 4 - , pytestCheckHook 5 - , glibcLocales 6 - , entrypoints 7 - , bleach 6 + , ipywidgets 7 + , jinja2 8 + , jupyterlab-pygments 9 + , lib 10 + , markupsafe 8 11 , mistune 9 12 , nbclient 10 - , jinja2 11 - , pygments 12 - , traitlets 13 - , jupyter_core 14 - , jupyterlab-pygments 15 - , nbformat 16 - , ipykernel 17 13 , pandocfilters 18 - , tornado 19 - , jupyter-client 20 - , defusedxml 14 + , pyppeteer 15 + , pytestCheckHook 21 16 , tinycss2 22 - , beautifulsoup4 23 17 }: 24 18 25 19 buildPythonPackage rec { ··· 42 36 substituteAllInPlace ./nbconvert/exporters/templateexporter.py 43 37 ''; 44 38 45 - checkInputs = [ pytestCheckHook glibcLocales ]; 46 - 47 39 propagatedBuildInputs = [ 48 - entrypoints bleach mistune jinja2 pygments traitlets 49 - jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client 50 - defusedxml tinycss2 beautifulsoup4 40 + beautifulsoup4 41 + bleach 42 + defusedxml 43 + jinja2 44 + jupyterlab-pygments 45 + markupsafe 46 + mistune 51 47 nbclient 52 - jupyterlab-pygments 48 + pandocfilters 49 + tinycss2 53 50 ]; 54 51 55 - # disable preprocessor tests for ipython 7 56 - # see issue https://github.com/jupyter/nbconvert/issues/898 57 52 preCheck = '' 58 - export LC_ALL=en_US.UTF-8 59 - HOME=$(mktemp -d) 53 + export HOME=$(mktemp -d) 60 54 ''; 61 55 62 - pytestFlagsArray = [ 63 - "--ignore=nbconvert/preprocessors/tests/test_execute.py" 64 - # can't resolve template paths within sandbox 65 - "--ignore=nbconvert/tests/base.py" 66 - "--ignore=nbconvert/tests/test_nbconvertapp.py" 56 + checkInputs = [ 57 + ipywidgets 58 + pyppeteer 59 + pytestCheckHook 67 60 ]; 68 61 62 + pytestFlagsArray = [ 63 + # DeprecationWarning: Support for bleach <5 will be removed in a future version of nbconvert 64 + "-W ignore::DeprecationWarning" 65 + ]; 69 66 70 67 disabledTests = [ 68 + # Attempts network access (Failed to establish a new connection: [Errno -3] Temporary failure in name resolution) 71 69 "test_export" 72 - "test_webpdf_without_chromium" 73 - #"test_cell_tag_output" 74 - #"test_convert_from_stdin" 75 - #"test_convert_full_qualified_name" 70 + "test_webpdf_with_chromium" 76 71 ]; 77 72 78 73 # Some of the tests use localhost networking.
+2 -1
pkgs/development/python-modules/pweave/default.nix
··· 7 7 , nbconvert 8 8 , markdown 9 9 , isPy3k 10 + , ipykernel 10 11 }: 11 12 12 13 buildPythonPackage rec { ··· 21 22 disabled = !isPy3k; 22 23 23 24 buildInputs = [ mock pkgs.glibcLocales ]; 24 - propagatedBuildInputs = [ matplotlib nbconvert markdown ]; 25 + propagatedBuildInputs = [ ipykernel matplotlib nbconvert markdown ]; 25 26 26 27 # fails due to trying to run CSS as test 27 28 doCheck = false;
+9 -2
pkgs/development/python-modules/widgetsnbextension/default.nix
··· 8 8 buildPythonPackage rec { 9 9 pname = "widgetsnbextension"; 10 10 version = "3.6.0"; 11 + format = "setuptools"; 11 12 12 13 src = fetchPypi { 13 14 inherit pname version; 14 - sha256 = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; 15 + hash = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; 15 16 }; 16 17 17 - propagatedBuildInputs = [ notebook ]; 18 + # setup.py claims to require notebook, but the source doesn't have any imports 19 + # in it. 20 + postPatch = '' 21 + substituteInPlace setup.py --replace "'notebook>=4.4.1'," "" 22 + ''; 23 + 24 + propagatedBuildInputs = [ ]; 18 25 19 26 # No tests in archive 20 27 doCheck = false;