From d6259ae285c11decbb939c4da217a7d882a84f5c Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Mon, 9 Dec 2019 16:47:12 +0000 Subject: [PATCH 1/2] Don't monkeypatch environment data locations for test notebook server --- notebook/tests/launchnotebook.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/notebook/tests/launchnotebook.py b/notebook/tests/launchnotebook.py index 3dadf44840..b873457316 100644 --- a/notebook/tests/launchnotebook.py +++ b/notebook/tests/launchnotebook.py @@ -124,12 +124,15 @@ def tmp(*parts): cls.notebook_dir = tmp('notebooks') cls.env_patch = patch.dict('os.environ', cls.get_patch_env()) cls.env_patch.start() + # Patch systemwide & user-wide data & config directories, to isolate + # the tests from oddities of the local setup. But leave Python env + # locations alone, so data files for e.g. nbconvert are accessible. + # If this isolation isn't sufficient, you may need to run the tests in + # a virtualenv or conda env. cls.path_patch = patch.multiple( jupyter_core.paths, SYSTEM_JUPYTER_PATH=[tmp('share', 'jupyter')], - ENV_JUPYTER_PATH=[tmp('env', 'share', 'jupyter')], SYSTEM_CONFIG_PATH=[tmp('etc', 'jupyter')], - ENV_CONFIG_PATH=[tmp('env', 'etc', 'jupyter')], ) cls.path_patch.start() From e53383ceb28da0c9052cf83c271bfca309a124de Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Mon, 9 Dec 2019 16:48:36 +0000 Subject: [PATCH 2/2] Allow testing with nbconvert 6 again (unpin) Closes gh-5086 Closes gh-5092 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d90729bb7d..33eda15eb3 100755 --- a/setup.py +++ b/setup.py @@ -107,7 +107,7 @@ 'jupyter_core>=4.6.0', 'jupyter_client>=5.3.4', 'nbformat', - 'nbconvert<6', + 'nbconvert', 'ipykernel', # bless IPython kernel for now 'Send2Trash', 'terminado>=0.8.1',