Benjamin Schubert authored Dec 04, 2020 and bst-marge-bot committed Dec 07, 2020

* .pylintrc: Disable new `raise-missing-from` check. We might want to
  enable that later, but it fails in many places. Let's not merge both
  changes here.

* pluginoriginpip.py: Catch the newer thrown exception from
  pkg_resources. The previous one still exists, so we should be good
  keeping the same compatibility as before