tests

Merge pull request #3514 from regro/relock-conda #4936

Job	Run time
tests / tests (1)	10m 33s
tests / tests (2)	11m 0s
tests / test-coverage-and-durations	27s
	22m 0s

Provide feedback