Created attachment 316869 [details, diff] upstream commit (excluding release notes changes) fixing sphinx-related test failures One of the changes in bzr-2.5.1 was the removal of a bzr-specific sphinx extension. This included removing bzrlib.tests.features.sphinx, but unfortunately bzrlib.tests.test_utextwrap still references this. This causes most (all?) tests in test_utextwrap to fail. The fix is to remove the check for features.sphinx.available() (upstream commit 6523, patch attached). With this change bzr-2.5.1 passes its tests here. It would also be nice to change the "test? ( || ( dev-python/pyftpdlib dev-python/medusa ) )" dependency to "test? ( >=dev-python/pyftpdlib0.7.0 )" as the release notes for 2.5.1 mention "Add support for pyftpdlib >= 0.7.0 and drop support for previous pyftpdlib versions." and the medusa support is disabled (see bzrlib/tests/ftp_server/__init__.py). If you're ok with me just committing this kind of thing in the feature I'd not mind joining the bazaar herd and doing that from now on.
Go ahead.
Thanks, committed (no revbump as this kind of tiny test-only fix can be treated as a compilation fix).
