The patch "patch-docs_conf_py" is now included and not needed anymore. Backport two simple patches from master. They are needed for vdirsyncer to work with newer click versions. ok sthen@
vdirsyncer calls setuptools_scm from within sphinx which is a no-no. Fix it with patch from From https://github.com/pimutils/vdirsyncer/pull/799/ OK remi@ sthen@