Commit55830e5

committed

Merge branch 'v2.1.0-doc' into v2.1.x

2 parents032b374 +b8e997f commit55830e5Copy full SHA for 55830e5

File tree

+353

-667

lines changed

+353

-667

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ install:`
`70`	`70`	`-echo %PYTHON_VERSION% %TARGET_ARCH%`
`71`	`71`	`-if %PYTHON_VERSION% == 2.7 conda install -q backports.functools_lru_cache`
`72`	`72`	`# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124`
`73`		`- -pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout`
	`73`	`+ -pip install -q"pytest!=3.3.0" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout`
`74`	`74`
`75`	`75`	# Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
`76`	`76`	`# https://github.com/matplotlib/matplotlib/issues/9176`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ install:`
`136`	`136`
`137`	`137`	`# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124`
`138`	`138`	`pip install $PRE \`
`139`		`- pytest \`
	`139`	`+ pytest!=3.3.0 \`
`140`	`140`	`pytest-cov>=2.3.1 \`
`141`	`141`	`pytest-faulthandler \`
`142`	`142`	`pytest-rerunfailures \`

Lines changed: 1 addition & 1 deletion

Comments

(0)