Commitc485e66

committed

deps, PY2: retractbackports.tempfile dep

1 parent47efb41 commitc485e66Copy full SHA for c485e66

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ install:`
`54`	`54`	`)`
`55`	`55`	`-pip install nose ddt wheel codecov`
`56`	`56`	`-IF "%PYTHON_VERSION%"=="2.7" (`
`57`		`-pip install mock contextlib2 backports.tempfile`
	`57`	`+pip install mock contextlib2`
`58`	`58`	`)`
`59`	`59`
`60`	`60`	## Copied from `init-tests-after-clone.sh`.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ install:`
`18`	`18`	`-git submodule update --init --recursive`
`19`	`19`	`-git fetch --tags`
`20`	`20`	`-pip install codecov flake8 ddt sphinx`
`21`		`- -if [ "$TRAVIS_PYTHON_VERSION" == '2.7' ]; then pip install mock contextlib2 backports.tempfile; fi`
	`21`	`+ -if [ "$TRAVIS_PYTHON_VERSION" == '2.7' ]; then pip install mock contextlib2; fi`
`22`	`22`
`23`	`23`	`# generate some reflog as git-python tests need it (in master)`
`24`	`24`	`-./init-tests-after-clone.sh`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,8 @@`
`23`	`23`	`try:`
`24`	`24`	`fromunittestimportmock`
`25`	`25`	`fromcontextlibimportExitStack`
`26`		`-fromtempfileimportTemporaryDirectory`
`27`	`26`	`exceptImportError:# PY2`
`28`	`27`	`fromcontextlib2importExitStack# @UnusedImport`
`29`		`-frombackports.tempfileimportTemporaryDirectory# @UnusedImport`
`30`	`28`
`31`	`29`
`32`	`30`	`ospd=osp.dirname`
`@@ -243,7 +241,9 @@ def cleanup_clone(repo):`
`243`	`241`	`gc.collect()`
`244`	`242`
`245`	`243`	`withExitStack()asstack:`
`246`		`-clone_dir=stack.enter_context(TemporaryDirectory(prefix=clone_prefix))`
	`244`	`+clone_dir=tempfile.mkdtemp(prefix=clone_prefix)`
	`245`	`+stack.callback(rmtree,clone_dir)`
	`246`	`+`
`247`	`247`	`clone=repo.clone(clone_dir,**clone_kwargs)`
`248`	`248`	`stack.callback(cleanup_clone,clone)`
`249`	`249`

Lines changed: 0 additions & 1 deletion

Comments

(0)