fixup! Merge pkg_resources workaround
fixup! Merge pkg_resources workaround

MichaelAquilina/pytest,pytest-dev/pytest,nicoddemus/pytest,The-Compiler/pytest,nicoddemus/pytest,alfredodeza/pytest,malinoff/pytest,rmfitzpatrick/pytest,tomviner/pytest,tareqalayan/pytest,pfctdayelise/pytest,davidszotten/pytest,hackebrot/pytest,tomviner/pytest,markshao/pytest,jaraco/pytest,etataurov/pytest,flub/pytest,hpk42/pytest,vmalloc/dessert,RonnyPfannschmidt/pytest,txomon/pytest,skylarjhdownes/pytest,The-Compiler/pytest,ddboline/pytest,eli-b/pytest,hpk42/pytest,Akasurde/pytest,tgoodlet/pytest