Fix bug with incorrectly defactorized dependencies #706

[bartsanchez]

New version with improved changes, fixing errors raised
with the previous version:

#899
#906

Thanks for contributing a pull request!

If you are contributing for the first time or provide a trivial fix don't worry too
much about the checklist - we will help you get started.

Contribution checklist:

(also see CONTRIBUTING.rst for details)

• wrote descriptive pull request text
• added/updated test(s)
• updated/extended the documentation
• added relevant issue keyword
  in message body
• added news fragment in changelog folder
  • fragment name: <issue number>.<type>.rst for example (588.bugfix.rst)
  • <type> is must be one of bugfix, feature, deprecation,breaking, doc, misc
  • if pr has no issue: consider creating one first or change it to the pr number after creating the pr
  • "sign" fragment with "by @"
  • please use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files - by :user:superuser."
  • also see examples
• added yourself to CONTRIBUTORS (preserving alphabetical order)

[gaborbernat]

see my comments from #1057.

[gaborbernat]

@bartsanchez note the ci failed with formatting, plus comments from #1057

[bartsanchez]

I've updated the PR. Please, let me know if anything else should be changed.

[gaborbernat]

will do tomorrow or so 😃

[gaborbernat]

@bartsanchez now looks all good, thank you very much for your collaboration and time!