Follow up on cleaning up the removal of Generic (#2769)
#7056
python-ci.yml
on: push
Matrix: integration-test
Matrix: lint-and-test