tests

Merge pull request #3510 from regro/relock-conda #4930

Job	Run time
tests / tests (1)	12m 1s
tests / tests (2)	12m 11s
tests / test-coverage-and-durations	27s
	24m 39s

Provide feedback