Commit210712f

authored

Merge branch 'main' into pytest

2 parents3b9b153 +b66bfbd commit210712fCopy full SHA for 210712f

File tree

-1

lines changed

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,12 @@ jobs:`
`29`	`29`	`run:\|`
`30`	`30`	`set -x`
`31`	`31`	`python -m pip install --upgrade pip setuptools wheel`
	`32`	`+1 conflicting file`
	`33`	`+pythonpackage.yml`
	`34`	`+.github/workflows/pythonpackage.yml`
	`35`	`+.github/workflows/pythonpackage.yml`
	`36`	`+1 conflict`
	`37`	`+`
`32`	`38`	`python --version; git --version`
`33`	`39`	`git submodule update --init --recursive`
`34`	`40`	`git fetch --tags`
`@@ -55,7 +61,7 @@ jobs:`
`55`	`61`	`set -x`
`56`	`62`	`pip install mypy`
`57`	`63`	`mypy -p git`
`58`		`-`
	`64`	`+`
`59`	`65`	`-name:Documentation`
`60`	`66`	`run:\|`
`61`	`67`	`set -x`

Comments

(0)