Commitd0a7435

authored

Merge pull request#5111 from takluyver/nbconvert6-tests-notsoisolated

Fix running tests with nbconvert 6 prerelease

2 parents5e5ad60 +e53383c commitd0a7435Copy full SHA for d0a7435

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,12 +124,15 @@ def tmp(*parts):`
`124`	`124`	`cls.notebook_dir=tmp('notebooks')`
`125`	`125`	`cls.env_patch=patch.dict('os.environ',cls.get_patch_env())`
`126`	`126`	`cls.env_patch.start()`
	`127`	`+# Patch systemwide & user-wide data & config directories, to isolate`
	`128`	`+# the tests from oddities of the local setup. But leave Python env`
	`129`	`+# locations alone, so data files for e.g. nbconvert are accessible.`
	`130`	`+# If this isolation isn't sufficient, you may need to run the tests in`
	`131`	`+# a virtualenv or conda env.`
`127`	`132`	`cls.path_patch=patch.multiple(`
`128`	`133`	`jupyter_core.paths,`
`129`	`134`	`SYSTEM_JUPYTER_PATH=[tmp('share','jupyter')],`
`130`		`-ENV_JUPYTER_PATH=[tmp('env','share','jupyter')],`
`131`	`135`	`SYSTEM_CONFIG_PATH=[tmp('etc','jupyter')],`
`132`		`-ENV_CONFIG_PATH=[tmp('env','etc','jupyter')],`
`133`	`136`	`)`
`134`	`137`	`cls.path_patch.start()`
`135`	`138`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@`
`107`	`107`	`'jupyter_core>=4.6.0',`
`108`	`108`	`'jupyter_client>=5.3.4',`
`109`	`109`	`'nbformat',`
`110`		`-'nbconvert<6',`
	`110`	`+'nbconvert',`
`111`	`111`	`'ipykernel',# bless IPython kernel for now`
`112`	`112`	`'Send2Trash',`
`113`	`113`	`'terminado>=0.8.1',`

Comments

(0)