Merge pull request conda#608 from maresb/add-setuptools-dependency

Add explicit `setuptools` dependency

Merge pull request conda#586 from tadeu/deadlock-followup

Add explanation and minor improvement to conda#581

Merge pull request conda#597 from jfrost-mo/main

Increase minimum ensureconda version for py3.12 compatibility

Merge pull request conda#584 from maresb/reenable-conda-tests

Reenable testing with Conda

Merge pull request conda#558 from maresb/filter-virtual-packages

Filter virtual packages

Merge pull request conda#524 from mariusvniekerk/alphabetize-lock

Alphabetize unified lockfiles

Merge pull request conda#541 from lesteve/pip-finds-recent-manylinux-…

…wheels

Make recent manylinux wheels findable by pypi_resolver

Merge pull request conda#535 from jacksmith15/fix/464/fix-platform-va…

…lidation

Fix platform validation for non-default names

Merge pull request conda#533 from maresb/fix-flaky-test

Speed up a test which keeps timing out

Merge pull request conda#506 from conda/maresb-patch-2

Stop running relock workflow on push to main