Fix dependencies

This brings back the commit from @piotr-dobrogost that seems to have got lost, and adds a new commit to make the dependencies between setup.py and requirements.txt consistent.