gentoo auto-resync : 06:10:2023 - 23:58:42

3 files changed, 35 insertions, 5 deletions

diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 56522d46b470..75c75c57263c 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,4 +1,5 @@
 AUX pbr-5.11.1-importlib-suffixes.patch 1383 BLAKE2B a8931bfe53a6609479de4eaa27a9ed28bd59319f79cf80dbe8f2578783cc6b57d641ca2c014793546efd52615ba4343a2a09527973107568c983c431329566d5 SHA512 537cdcb21e4f104731327f92d2af0b478fa9cdee792eff206f51ef59e473252c6f1ed6eeba7105b57ea6759d43ce8b4de51f61689a5b1585920ed46a1a675e33
+AUX pbr-5.11.1-sphinx-tests.patch 1281 BLAKE2B a39328c0071d78ba9ec654ad198161522e5866a7627cbe7995290b44d70bb913dc5b3e335b8445b804ee7e1aa4c71bdebf5b5f60f943cfff0a4f91fdb50a0b59 SHA512 83d5301a4379d71672fd2870d827c40a4517283794029672d0f6be26a01020a5e0aae9f6ead91725dba682fffcba8ed5626637c5c9d4bedaef6f7a6cb4d45212
 DIST pbr-5.11.1.tar.gz 127597 BLAKE2B 4ed433f271b4cbed3e7baca66cbeef057d575b7b061507c45a65ba93704edbed7b6f8668e9b9766f03079aaf06dbd6c394960c1c528b1beb992db65d0c3b89e4 SHA512 466dc5ce2622c43451186698f00d405141878449ffe9f7771b0057e8356bf12b426a9bfefff7e5843f1b3f963af3ffc9c4a42fa91a9407b79617abea046ff438
-EBUILD pbr-5.11.1.ebuild 2330 BLAKE2B b12cadb937a3fbaeb31f38d22428a795e937e4e50ffbc8d5fa54f98cc4ca30e0be7e70808ea1e7804f925493e98fd6159219605dca8b4bf57a3ae808b06f5cee SHA512 c84c034098f26e1ddf161383f64d9c1659583b708b25cf8df5f4f5e54feeb16facf64152d3858fd866773595b1dda758c07b9a2ef20aba8c1c825be5e81ccfec
+EBUILD pbr-5.11.1.ebuild 2190 BLAKE2B a24e5f2bc94d507ce1887426117ec477515970b69907356f3344c4b2c354133a09b2bfee61ca920f6acb096b51fe3fe9d7bc1ffcd03ed61e52cd0fb7609c5e9f SHA512 f26c4e8fbe99b1a7370533c48d5354baea5067a32efb3c12981d77467131b8b02db9724aedf2ea1d07735216f57de11fb81cb9ebff40616111b0f784f95f6934
 MISC metadata.xml 815 BLAKE2B 439ee90d79572a8653f1ae3b8b5bf0883adb34ceac5257458dba7a2505e25ebba1c5080095139f6521d8fbd57c11ea38cf4049710b584069aea0ebaa7760077a SHA512 3d0618ef6656706acd829be80b2e6a0b0763b5f4128dcd360f28818d42cbc8825ecd04f7f47af5929a3a35fd60a3b9f9816cc37ee30af164c2e5b51764c25afe
diff --git a/dev-python/pbr/files/pbr-5.11.1-sphinx-tests.patch b/dev-python/pbr/files/pbr-5.11.1-sphinx-tests.patch
new file mode 100644
index 000000000000..0cdb1fe48ec3
--- /dev/null
+++ b/dev-python/pbr/files/pbr-5.11.1-sphinx-tests.patch
@@ -0,0 +1,32 @@
+diff --git a/pbr/tests/test_core.py b/pbr/tests/test_core.py
+index edb7c7b..1730c4f 100644
+--- a/pbr/tests/test_core.py
++++ b/pbr/tests/test_core.py
+@@ -78,6 +78,7 @@ class TestCore(base.BaseTestCase):
+         assert stdout == 'packaging, distutils, setuptools'
+ 
+     def test_setup_py_build_sphinx(self):
++        self.skipTest("broken with sphinx-7, obsolete")
+         stdout, _, return_code = self.run_setup('build_sphinx')
+         self.assertEqual(0, return_code)
+ 
+diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py
+index 4307708..ea5bd3d 100644
+--- a/pbr/tests/test_setup.py
++++ b/pbr/tests/test_setup.py
+@@ -231,6 +231,7 @@ class BaseSphinxTest(base.BaseTestCase):
+ 
+     def setUp(self):
+         super(BaseSphinxTest, self).setUp()
++        self.skipTest("broken with sphinx-7, obsolete")
+ 
+         # setup_command requires the Sphinx instance to have some
+         # attributes that aren't set normally with the way we use the
+@@ -379,6 +380,7 @@ class APIAutoDocTest(base.BaseTestCase):
+ 
+     def setUp(self):
+         super(APIAutoDocTest, self).setUp()
++        self.skipTest("broken with sphinx-7, obsolete")
+ 
+         # setup_command requires the Sphinx instance to have some
+         # attributes that aren't set normally with the way we use the
diff --git a/dev-python/pbr/pbr-5.11.1.ebuild b/dev-python/pbr/pbr-5.11.1.ebuild
index 5448662cdd64..34c9fbe14271 100644
--- a/dev-python/pbr/pbr-5.11.1.ebuild
+++ b/dev-python/pbr/pbr-5.11.1.ebuild
@@ -29,9 +29,6 @@ RDEPEND="
 # https://bugs.gentoo.org/show_bug.cgi?id=561038 docutils is needed for sphinx
 # exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848 stestr is run as
 # external tool.
-#
-# <dev-python/sphinx-7 is required because of removed build_sphinx hook in
-# setup.py, see https://bugs.launchpad.net/pbr/+bug/2018453
 BDEPEND="
 	test? (
 		$(python_gen_cond_dep '
@@ -39,7 +36,6 @@ BDEPEND="
 			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-7[${PYTHON_USEDEP}]
 			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
 			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
@@ -51,6 +47,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${P}-importlib-suffixes.patch"
+	"${FILESDIR}/${P}-sphinx-tests.patch"
 )
 
 distutils_enable_tests unittest