python-pbr.spec

@@ -1,15 +1,13 @@
 Name:           python-pbr
-Version:        5.4.5
+Version:        4.1.1
-Release:        3
+Release:        2
 Summary:        Python Build Reasonableness
 License:        ASL 2.0
 URL:            http://pypi.python.org/pypi/pbr
 Source0:        https://pypi.io/packages/source/p/pbr/pbr-%{version}.tar.gz
-Patch0000:      refresh-testcase.patch
-BuildRequires:  python3-sphinx python3-testscenarios python3-virtualenv
-BuildRequires:  python3-testresources python3-wheel
 
 BuildArch:      noarch
+BuildRequires:  python2-sphinx >= 1.1.3 python2-oslo-sphinx
 
 %description
 PBR is a library that injects some useful and sensible default behaviors into
@@ -23,20 +21,22 @@ Summary:        Python Build Reasonableness
 %{?python_provide:%python_provide python2-pbr}
 
 BuildRequires:  python2-devel python2-setuptools
-BuildRequires:  python2-coverage python2-mock
+BuildRequires:  python2-coverage python2-hacking python2-mock python2-testrepository
-BuildRequires:  python2-testscenarios git gnupg
+BuildRequires:  python2-testresources python2-testscenarios git gnupg
 Requires:       python2-setuptools
 
 
 %description -n python2-pbr
 Manage dynamic plugins for Python applications
 
+
 %package -n python3-pbr
 Summary:        Python Build Reasonableness
 %{?python_provide:%python_provide python3-pbr}
 
 BuildRequires:  python3-devel python3-setuptools
 Requires:       python3-setuptools
+
 %description -n python3-pbr
 Manage dynamic plugins for Python applications
 
@@ -51,45 +51,33 @@ export SKIP_PIP_INSTALL=1
 %py2_build
 %py3_build
 
+sphinx-build doc/source html
+rm -rf html/.{doctrees,buildinfo}
+
+
 %install
-%py2_install
 %py3_install
-rm -rf %{buildroot}%{python3_sitelib}/pbr/tests
 mv %{buildroot}%{_bindir}/pbr %{buildroot}%{_bindir}/pbr-3
-ln -s ./pbr-3 %{buildroot}%{_bindir}/pbr
+
+%py2_install
 
 %check
-%{__python3} setup.py test
+%{__python2} setup.py test
-#we didn't provide python2-testscenarios and python2-testresources,so skip py2 tests
-#%{__python2} setup.py test
 
 %files -n python2-pbr
-%doc LICENSE README.rst
+%doc LICENSE html README.rst
 %{_bindir}/pbr
 %{python2_sitelib}/*.egg-info
 %{python2_sitelib}/pbr
 %exclude %{python2_sitelib}/pbr/tests
 
 %files -n python3-pbr
-%doc LICENSE README.rst
+%doc LICENSE html README.rst
 %{_bindir}/pbr-3
 %{python3_sitelib}/*.egg-info
 %{python3_sitelib}/pbr
 %exclude %{python3_sitelib}/pbr/tests
 
-
 %changelog
-* Wed Aug 04 2021 shixuantong <shixuantong@huawei.com> - 5.4.5-3
-- fix python3-pbr install fail problem without python2
-
-* Wed 16 Jun 2021 sunguoshuai<sunguoshuai@huawei.com> - 5.4.5-2
-- Add some buildrequires packages for testing and skip some testcases.
-
-* Mon Aug 24 2020 wenzhanli<wenzhanli2@huawei.com> - 5.4.5-1
-- Bump to version 5.4.5.
-
-* Fri Feb 21 2020 Wanjiankang <wanjiankang@huawei.com> - 4.1.1-3
-- Modify BuildRequires.
-
 * Fri Nov 22 2019 Wanjiankang <wanjiankang@huawei.com> - 4.1.1-2
 - Initial package.

python-pbr.yaml

@@ -1,4 +0,0 @@
-version_control: pypi
-src_repo: pbr
-tag_prefix: "^v"
-seperator: "."

refresh-testcase.patch

@@ -1,592 +0,0 @@
-From ce2364352471d3d3d54af4c282a2d26d093fa267 Mon Sep 17 00:00:00 2001
-From: si-gui <sunguoshuai@huawei.com>
-Date: Wed, 16 Jun 2021 16:50:14 +0800
-Subject: [PATCH] refresh testcase
-
----
- pbr/tests/test_packaging.py | 272 ++++++++++++++++++------------------
- pbr/tests/test_setup.py     | 166 +++++++++++-----------
- pbr/tests/test_util.py      |  44 +++---
- 3 files changed, 241 insertions(+), 241 deletions(-)
-
-diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py
-index 07be547..2abca30 100644
---- a/pbr/tests/test_packaging.py
-+++ b/pbr/tests/test_packaging.py
-@@ -55,7 +55,7 @@ import testscenarios
- import testtools
- from testtools import matchers
- import virtualenv
--from wheel import wheelfile
-+#from wheel import wheelfile
- 
- from pbr import git
- from pbr import packaging
-@@ -181,20 +181,20 @@ class Venv(fixtures.Fixture):
-         else:
-             self.pip_cmd = pip_cmd
- 
--    def _setUp(self):
--        path = self.useFixture(fixtures.TempDir()).path
--        virtualenv.create_environment(path, clear=True)
--        python = os.path.join(path, 'bin', 'python')
--        command = [python] + self.pip_cmd + ['-U']
--        if self.modules and len(self.modules) > 0:
--            command.extend(self.modules)
--            self.useFixture(base.CapturedSubprocess(
--                'mkvenv-' + self._reason, command))
--        self.addCleanup(delattr, self, 'path')
--        self.addCleanup(delattr, self, 'python')
--        self.path = path
--        self.python = python
--        return path, python
-+#    def _setUp(self):
-+#        path = self.useFixture(fixtures.TempDir()).path
-+#        virtualenv.create_environment(path, clear=True)
-+#        python = os.path.join(path, 'bin', 'python')
-+#        command = [python] + self.pip_cmd + ['-U']
-+#        if self.modules and len(self.modules) > 0:
-+#            command.extend(self.modules)
-+#            self.useFixture(base.CapturedSubprocess(
-+#                'mkvenv-' + self._reason, command))
-+#        self.addCleanup(delattr, self, 'path')
-+#        self.addCleanup(delattr, self, 'python')
-+#        self.path = path
-+#        self.python = python
-+#        return path, python
- 
- 
- class CreatePackages(fixtures.Fixture):
-@@ -359,50 +359,50 @@ class TestPackagingInGitRepoWithoutCommit(base.BaseTestCase):
-         self.assertEqual('CHANGES\n=======\n\n', body)
- 
- 
--class TestPackagingWheels(base.BaseTestCase):
--
--    def setUp(self):
--        super(TestPackagingWheels, self).setUp()
--        self.useFixture(TestRepo(self.package_dir))
--        # Build the wheel
--        self.run_setup('bdist_wheel', allow_fail=False)
--        # Slowly construct the path to the generated whl
--        dist_dir = os.path.join(self.package_dir, 'dist')
--        relative_wheel_filename = os.listdir(dist_dir)[0]
--        absolute_wheel_filename = os.path.join(
--            dist_dir, relative_wheel_filename)
--        wheel_file = wheelfile.WheelFile(absolute_wheel_filename)
--        wheel_name = wheel_file.parsed_filename.group('namever')
--        # Create a directory path to unpack the wheel to
--        self.extracted_wheel_dir = os.path.join(dist_dir, wheel_name)
--        # Extract the wheel contents to the directory we just created
--        wheel_file.extractall(self.extracted_wheel_dir)
--        wheel_file.close()
--
--    def test_data_directory_has_wsgi_scripts(self):
--        # Build the path to the scripts directory
--        scripts_dir = os.path.join(
--            self.extracted_wheel_dir, 'pbr_testpackage-0.0.data/scripts')
--        self.assertTrue(os.path.exists(scripts_dir))
--        scripts = os.listdir(scripts_dir)
--
--        self.assertIn('pbr_test_wsgi', scripts)
--        self.assertIn('pbr_test_wsgi_with_class', scripts)
--        self.assertNotIn('pbr_test_cmd', scripts)
--        self.assertNotIn('pbr_test_cmd_with_class', scripts)
--
--    def test_generates_c_extensions(self):
--        built_package_dir = os.path.join(
--            self.extracted_wheel_dir, 'pbr_testpackage')
--        static_object_filename = 'testext.so'
--        soabi = get_soabi()
--        if soabi:
--            static_object_filename = 'testext.{0}.so'.format(soabi)
--        static_object_path = os.path.join(
--            built_package_dir, static_object_filename)
--
--        self.assertTrue(os.path.exists(built_package_dir))
--        self.assertTrue(os.path.exists(static_object_path))
-+#class TestPackagingWheels(base.BaseTestCase):
-+#
-+#    def setUp(self):
-+#        super(TestPackagingWheels, self).setUp()
-+#        self.useFixture(TestRepo(self.package_dir))
-+#        # Build the wheel
-+#        self.run_setup('bdist_wheel', allow_fail=False)
-+#        # Slowly construct the path to the generated whl
-+#        dist_dir = os.path.join(self.package_dir, 'dist')
-+#        relative_wheel_filename = os.listdir(dist_dir)[0]
-+#        absolute_wheel_filename = os.path.join(
-+#            dist_dir, relative_wheel_filename)
-+#        wheel_file = wheelfile.WheelFile(absolute_wheel_filename)
-+#        wheel_name = wheel_file.parsed_filename.group('namever')
-+#        # Create a directory path to unpack the wheel to
-+#        self.extracted_wheel_dir = os.path.join(dist_dir, wheel_name)
-+#        # Extract the wheel contents to the directory we just created
-+#        wheel_file.extractall(self.extracted_wheel_dir)
-+#        wheel_file.close()
-+#
-+#    def test_data_directory_has_wsgi_scripts(self):
-+#        # Build the path to the scripts directory
-+#        scripts_dir = os.path.join(
-+#            self.extracted_wheel_dir, 'pbr_testpackage-0.0.data/scripts')
-+#        self.assertTrue(os.path.exists(scripts_dir))
-+#        scripts = os.listdir(scripts_dir)
-+#
-+#        self.assertIn('pbr_test_wsgi', scripts)
-+#        self.assertIn('pbr_test_wsgi_with_class', scripts)
-+#        self.assertNotIn('pbr_test_cmd', scripts)
-+#        self.assertNotIn('pbr_test_cmd_with_class', scripts)
-+#
-+#    def test_generates_c_extensions(self):
-+#        built_package_dir = os.path.join(
-+#            self.extracted_wheel_dir, 'pbr_testpackage')
-+#        static_object_filename = 'testext.so'
-+#        soabi = get_soabi()
-+#        if soabi:
-+#            static_object_filename = 'testext.{0}.so'.format(soabi)
-+#        static_object_path = os.path.join(
-+#            built_package_dir, static_object_filename)
-+#
-+#        self.assertTrue(os.path.exists(built_package_dir))
-+#        self.assertTrue(os.path.exists(static_object_path))
- 
- 
- class TestPackagingHelpers(testtools.TestCase):
-@@ -587,19 +587,19 @@ class ParseRequirementsTestScenarios(base.BaseTestCase):
-         ],
-         versioned_scenarios, subdirectory_scenarios)
- 
--    def test_parse_requirements(self):
--        tmp_file = tempfile.NamedTemporaryFile()
--        req_string = self.url
--        if hasattr(self, 'editable') and self.editable:
--            req_string = ("-e %s" % req_string)
--        if hasattr(self, 'versioned') and self.versioned:
--            req_string = ("%s-1.2.3" % req_string)
--        if hasattr(self, 'has_subdirectory') and self.has_subdirectory:
--            req_string = ("%s&subdirectory=baz" % req_string)
--        with open(tmp_file.name, 'w') as fh:
--            fh.write(req_string)
--        self.assertEqual(self.expected,
--                         packaging.parse_requirements([tmp_file.name]))
-+#    def test_parse_requirements(self):
-+#        tmp_file = tempfile.NamedTemporaryFile()
-+#        req_string = self.url
-+#        if hasattr(self, 'editable') and self.editable:
-+#            req_string = ("-e %s" % req_string)
-+#        if hasattr(self, 'versioned') and self.versioned:
-+#            req_string = ("%s-1.2.3" % req_string)
-+#        if hasattr(self, 'has_subdirectory') and self.has_subdirectory:
-+#            req_string = ("%s&subdirectory=baz" % req_string)
-+#        with open(tmp_file.name, 'w') as fh:
-+#            fh.write(req_string)
-+#        self.assertEqual(self.expected,
-+#                         packaging.parse_requirements([tmp_file.name]))
- 
- 
- class ParseDependencyLinksTest(base.BaseTestCase):
-@@ -854,70 +854,70 @@ class TestVersions(base.BaseTestCase):
-         os.environ.pop('SKIP_WRITE_GIT_CHANGELOG', None)
- 
- 
--class TestRequirementParsing(base.BaseTestCase):
--
--    def test_requirement_parsing(self):
--        pkgs = {
--            'test_reqparse':
--                {
--                    'requirements.txt': textwrap.dedent("""\
--                        bar
--                        quux<1.0; python_version=='2.6'
--                        requests-aws>=0.1.4    # BSD License (3 clause)
--                        Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7'
--                        requests-kerberos>=0.6;python_version=='2.7' # MIT
--                    """),
--                    'setup.cfg': textwrap.dedent("""\
--                        [metadata]
--                        name = test_reqparse
--
--                        [extras]
--                        test =
--                            foo
--                            baz>3.2 :python_version=='2.7' # MIT
--                            bar>3.3 :python_version=='2.7' # MIT # Apache
--                    """)},
--        }
--        pkg_dirs = self.useFixture(CreatePackages(pkgs)).package_dirs
--        pkg_dir = pkg_dirs['test_reqparse']
--        # pkg_resources.split_sections uses None as the title of an
--        # anonymous section instead of the empty string. Weird.
--        expected_requirements = {
--            None: ['bar', 'requests-aws>=0.1.4'],
--            ":(python_version=='2.6')": ['quux<1.0'],
--            ":(python_version=='2.7')": ['Routes!=2.0,!=2.1,>=1.12.3',
--                                         'requests-kerberos>=0.6'],
--            'test': ['foo'],
--            "test:(python_version=='2.7')": ['baz>3.2', 'bar>3.3']
--        }
--        venv = self.useFixture(Venv('reqParse'))
--        bin_python = venv.python
--        # Two things are tested by this
--        # 1) pbr properly parses markers from requiremnts.txt and setup.cfg
--        # 2) bdist_wheel causes pbr to not evaluate markers
--        self._run_cmd(bin_python, ('setup.py', 'bdist_wheel'),
--                      allow_fail=False, cwd=pkg_dir)
--        egg_info = os.path.join(pkg_dir, 'test_reqparse.egg-info')
--
--        requires_txt = os.path.join(egg_info, 'requires.txt')
--        with open(requires_txt, 'rt') as requires:
--            generated_requirements = dict(
--                pkg_resources.split_sections(requires))
--
--        # NOTE(dhellmann): We have to spell out the comparison because
--        # the rendering for version specifiers in a range is not
--        # consistent across versions of setuptools.
--
--        for section, expected in expected_requirements.items():
--            exp_parsed = [
--                pkg_resources.Requirement.parse(s)
--                for s in expected
--            ]
--            gen_parsed = [
--                pkg_resources.Requirement.parse(s)
--                for s in generated_requirements[section]
--            ]
--            self.assertEqual(exp_parsed, gen_parsed)
-+#class TestRequirementParsing(base.BaseTestCase):
-+#
-+#    def test_requirement_parsing(self):
-+#        pkgs = {
-+#            'test_reqparse':
-+#                {
-+#                    'requirements.txt': textwrap.dedent("""\
-+#                        bar
-+#                        quux<1.0; python_version=='2.6'
-+#                        requests-aws>=0.1.4    # BSD License (3 clause)
-+#                        Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7'
-+#                        requests-kerberos>=0.6;python_version=='2.7' # MIT
-+#                    """),
-+#                    'setup.cfg': textwrap.dedent("""\
-+#                        [metadata]
-+#                        name = test_reqparse
-+#
-+#                        [extras]
-+#                        test =
-+#                            foo
-+#                            baz>3.2 :python_version=='2.7' # MIT
-+#                            bar>3.3 :python_version=='2.7' # MIT # Apache
-+#                    """)},
-+#        }
-+#        pkg_dirs = self.useFixture(CreatePackages(pkgs)).package_dirs
-+#        pkg_dir = pkg_dirs['test_reqparse']
-+#        # pkg_resources.split_sections uses None as the title of an
-+#        # anonymous section instead of the empty string. Weird.
-+#        expected_requirements = {
-+#            None: ['bar', 'requests-aws>=0.1.4'],
-+#            ":(python_version=='2.6')": ['quux<1.0'],
-+#            ":(python_version=='2.7')": ['Routes!=2.0,!=2.1,>=1.12.3',
-+#                                         'requests-kerberos>=0.6'],
-+#            'test': ['foo'],
-+#            "test:(python_version=='2.7')": ['baz>3.2', 'bar>3.3']
-+#        }
-+#        venv = self.useFixture(Venv('reqParse'))
-+#        bin_python = venv.python
-+#        # Two things are tested by this
-+#        # 1) pbr properly parses markers from requiremnts.txt and setup.cfg
-+#        # 2) bdist_wheel causes pbr to not evaluate markers
-+#        self._run_cmd(bin_python, ('setup.py', 'bdist_wheel'),
-+#                      allow_fail=False, cwd=pkg_dir)
-+#        egg_info = os.path.join(pkg_dir, 'test_reqparse.egg-info')
-+#
-+#        requires_txt = os.path.join(egg_info, 'requires.txt')
-+#        with open(requires_txt, 'rt') as requires:
-+#            generated_requirements = dict(
-+#                pkg_resources.split_sections(requires))
-+#
-+#        # NOTE(dhellmann): We have to spell out the comparison because
-+#        # the rendering for version specifiers in a range is not
-+#        # consistent across versions of setuptools.
-+#
-+#        for section, expected in expected_requirements.items():
-+#            exp_parsed = [
-+#                pkg_resources.Requirement.parse(s)
-+#                for s in expected
-+#            ]
-+#            gen_parsed = [
-+#                pkg_resources.Requirement.parse(s)
-+#                for s in generated_requirements[section]
-+#            ]
-+#            self.assertEqual(exp_parsed, gen_parsed)
- 
- 
- class TestRepositoryURLDependencies(base.BaseTestCase):
-diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py
-index d171d7c..fe4859d 100644
---- a/pbr/tests/test_setup.py
-+++ b/pbr/tests/test_setup.py
-@@ -149,36 +149,36 @@ class GitLogsTest(base.BaseTestCase):
-         self.useFixture(
-             fixtures.EnvironmentVariable('SKIP_WRITE_GIT_CHANGELOG'))
- 
--    def test_write_git_changelog(self):
--        self.useFixture(fixtures.FakePopen(lambda _: {
--            "stdout": BytesIO(self.changelog.encode('utf-8'))
--        }))
--
--        git.write_git_changelog(git_dir=self.git_dir,
--                                dest_dir=self.temp_path)
--
--        with open(os.path.join(self.temp_path, "ChangeLog"), "r") as ch_fh:
--            changelog_contents = ch_fh.read()
--            self.assertIn("2013.2", changelog_contents)
--            self.assertIn("0.5.17", changelog_contents)
--            self.assertIn("------", changelog_contents)
--            self.assertIn("Refactor hooks file", changelog_contents)
--            self.assertIn(
--                r"Bug fix: create\_stack() fails when waiting",
--                changelog_contents)
--            self.assertNotIn("Refactor hooks file.", changelog_contents)
--            self.assertNotIn("182feb3", changelog_contents)
--            self.assertNotIn("review/monty_taylor/27519", changelog_contents)
--            self.assertNotIn("0.5.13", changelog_contents)
--            self.assertNotIn("0.6.7", changelog_contents)
--            self.assertNotIn("12", changelog_contents)
--            self.assertNotIn("(evil)", changelog_contents)
--            self.assertNotIn("ev()il", changelog_contents)
--            self.assertNotIn("ev(il", changelog_contents)
--            self.assertNotIn("ev)il", changelog_contents)
--            self.assertNotIn("e(vi)l", changelog_contents)
--            self.assertNotIn('Merge "', changelog_contents)
--            self.assertNotIn(r'1\_foo.1', changelog_contents)
-+#    def test_write_git_changelog(self):
-+#        self.useFixture(fixtures.FakePopen(lambda _: {
-+#            "stdout": BytesIO(self.changelog.encode('utf-8'))
-+#        }))
-+#
-+#        git.write_git_changelog(git_dir=self.git_dir,
-+#                                dest_dir=self.temp_path)
-+#
-+#        with open(os.path.join(self.temp_path, "ChangeLog"), "r") as ch_fh:
-+#            changelog_contents = ch_fh.read()
-+#            self.assertIn("2013.2", changelog_contents)
-+#            self.assertIn("0.5.17", changelog_contents)
-+#            self.assertIn("------", changelog_contents)
-+#            self.assertIn("Refactor hooks file", changelog_contents)
-+#            self.assertIn(
-+#                r"Bug fix: create\_stack() fails when waiting",
-+#                changelog_contents)
-+#            self.assertNotIn("Refactor hooks file.", changelog_contents)
-+#            self.assertNotIn("182feb3", changelog_contents)
-+#            self.assertNotIn("review/monty_taylor/27519", changelog_contents)
-+#            self.assertNotIn("0.5.13", changelog_contents)
-+#            self.assertNotIn("0.6.7", changelog_contents)
-+#            self.assertNotIn("12", changelog_contents)
-+#            self.assertNotIn("(evil)", changelog_contents)
-+#            self.assertNotIn("ev()il", changelog_contents)
-+#            self.assertNotIn("ev(il", changelog_contents)
-+#            self.assertNotIn("ev)il", changelog_contents)
-+#            self.assertNotIn("e(vi)l", changelog_contents)
-+#            self.assertNotIn('Merge "', changelog_contents)
-+#            self.assertNotIn(r'1\_foo.1', changelog_contents)
- 
-     def test_generate_authors(self):
-         author_old = u"Foo Foo <email@foo.com>"
-@@ -291,25 +291,25 @@ class BuildSphinxTest(BaseSphinxTest):
-          dict(has_opt=False, autodoc='False', has_autodoc=False)),
-     ]
- 
--    def test_build_doc(self):
--        build_doc = packaging.LocalBuildDoc(self.distr)
--        build_doc.run()
--
--        self.assertTrue(
--            os.path.exists("api/autoindex.rst") == self.has_autodoc)
--        self.assertTrue(
--            os.path.exists(
--                "api/fake_package.fake_module.rst") == self.has_autodoc)
--        if not self.has_autodoc or hasattr(self, "excludes"):
--            assertion = self.assertFalse
--        else:
--            assertion = self.assertTrue
--        assertion(
--            os.path.exists(
--                "api/fake_package.fake_private_module.rst"))
--        assertion(
--            os.path.exists(
--                "api/fake_package.another_fake_module_for_testing.rst"))
-+#    def test_build_doc(self):
-+#        build_doc = packaging.LocalBuildDoc(self.distr)
-+#        build_doc.run()
-+#
-+#        self.assertTrue(
-+#            os.path.exists("api/autoindex.rst") == self.has_autodoc)
-+#        self.assertTrue(
-+#            os.path.exists(
-+#                "api/fake_package.fake_module.rst") == self.has_autodoc)
-+#        if not self.has_autodoc or hasattr(self, "excludes"):
-+#            assertion = self.assertFalse
-+#        else:
-+#            assertion = self.assertTrue
-+#        assertion(
-+#            os.path.exists(
-+#                "api/fake_package.fake_private_module.rst"))
-+#        assertion(
-+#            os.path.exists(
-+#                "api/fake_package.another_fake_module_for_testing.rst"))
- 
-     def test_builders_config(self):
-         build_doc = packaging.LocalBuildDoc(self.distr)
-@@ -339,40 +339,40 @@ class BuildSphinxTest(BaseSphinxTest):
-         self.assertIn('man', build_doc.builders)
-         self.assertIn('doctest', build_doc.builders)
- 
--    def test_cmd_builder_override(self):
--
--        if self.has_opt:
--            self.distr.command_options["pbr"] = {
--                "autodoc_index_modules": ('setup.cfg', self.autodoc)
--            }
--
--        self.distr.command_options["build_sphinx"]["builder"] = (
--            "command line", "non-existing-builder")
--
--        build_doc = packaging.LocalBuildDoc(self.distr)
--        self.assertNotIn('non-existing-builder', build_doc.builders)
--        self.assertIn('html', build_doc.builders)
--
--        # process command line options which should override config
--        build_doc.finalize_options()
--
--        self.assertIn('non-existing-builder', build_doc.builders)
--        self.assertNotIn('html', build_doc.builders)
--
--    def test_cmd_builder_override_multiple_builders(self):
--
--        if self.has_opt:
--            self.distr.command_options["pbr"] = {
--                "autodoc_index_modules": ('setup.cfg', self.autodoc)
--            }
--
--        self.distr.command_options["build_sphinx"]["builder"] = (
--            "command line", "builder1,builder2")
--
--        build_doc = packaging.LocalBuildDoc(self.distr)
--        build_doc.finalize_options()
--
--        self.assertEqual(["builder1", "builder2"], build_doc.builders)
-+#    def test_cmd_builder_override(self):
-+#
-+#        if self.has_opt:
-+#            self.distr.command_options["pbr"] = {
-+#                "autodoc_index_modules": ('setup.cfg', self.autodoc)
-+#            }
-+#
-+#        self.distr.command_options["build_sphinx"]["builder"] = (
-+#            "command line", "non-existing-builder")
-+#
-+#        build_doc = packaging.LocalBuildDoc(self.distr)
-+#        self.assertNotIn('non-existing-builder', build_doc.builders)
-+#        self.assertIn('html', build_doc.builders)
-+#
-+#        # process command line options which should override config
-+#        build_doc.finalize_options()
-+#
-+#        self.assertIn('non-existing-builder', build_doc.builders)
-+#        self.assertNotIn('html', build_doc.builders)
-+#
-+#    def test_cmd_builder_override_multiple_builders(self):
-+#
-+#        if self.has_opt:
-+#            self.distr.command_options["pbr"] = {
-+#                "autodoc_index_modules": ('setup.cfg', self.autodoc)
-+#            }
-+#
-+#        self.distr.command_options["build_sphinx"]["builder"] = (
-+#            "command line", "builder1,builder2")
-+#
-+#        build_doc = packaging.LocalBuildDoc(self.distr)
-+#        build_doc.finalize_options()
-+#
-+#        self.assertEqual(["builder1", "builder2"], build_doc.builders)
- 
- 
- class APIAutoDocTest(base.BaseTestCase):
-diff --git a/pbr/tests/test_util.py b/pbr/tests/test_util.py
-index 1cbb2d2..ea5e46b 100644
---- a/pbr/tests/test_util.py
-+++ b/pbr/tests/test_util.py
-@@ -79,12 +79,12 @@ class TestExtrasRequireParsingScenarios(base.BaseTestCase):
-             {}
-         })]
- 
--    def test_extras_parsing(self):
--        config = config_from_ini(self.config_text)
--        kwargs = util.setup_cfg_to_setup_kwargs(config)
--
--        self.assertEqual(self.expected_extra_requires,
--                         kwargs['extras_require'])
-+#    def test_extras_parsing(self):
-+#        config = config_from_ini(self.config_text)
-+#        kwargs = util.setup_cfg_to_setup_kwargs(config)
-+#
-+#        self.assertEqual(self.expected_extra_requires,
-+#                         kwargs['extras_require'])
- 
- 
- class TestInvalidMarkers(base.BaseTestCase):
-@@ -127,11 +127,11 @@ class TestMapFieldsParsingScenarios(base.BaseTestCase):
-         }),
-     ]
- 
--    def test_project_url_parsing(self):
--        config = config_from_ini(self.config_text)
--        kwargs = util.setup_cfg_to_setup_kwargs(config)
--
--        self.assertEqual(self.expected_project_urls, kwargs['project_urls'])
-+#    def test_project_url_parsing(self):
-+#        config = config_from_ini(self.config_text)
-+#        kwargs = util.setup_cfg_to_setup_kwargs(config)
-+#
-+#        self.assertEqual(self.expected_project_urls, kwargs['project_urls'])
- 
- 
- class TestKeywordsParsingScenarios(base.BaseTestCase):
-@@ -157,11 +157,11 @@ class TestKeywordsParsingScenarios(base.BaseTestCase):
-         }),
-     ]
- 
--    def test_keywords_parsing(self):
--        config = config_from_ini(self.config_text)
--        kwargs = util.setup_cfg_to_setup_kwargs(config)
--
--        self.assertEqual(self.expected_keywords, kwargs['keywords'])
-+#    def test_keywords_parsing(self):
-+#        config = config_from_ini(self.config_text)
-+#        kwargs = util.setup_cfg_to_setup_kwargs(config)
-+#
-+#        self.assertEqual(self.expected_keywords, kwargs['keywords'])
- 
- 
- class TestProvidesExtras(base.BaseTestCase):
-@@ -193,12 +193,12 @@ class TestDataFilesParsing(base.BaseTestCase):
-             ]
-         })]
- 
--    def test_handling_of_whitespace_in_data_files(self):
--        config = config_from_ini(self.config_text)
--        kwargs = util.setup_cfg_to_setup_kwargs(config)
--
--        self.assertEqual(self.data_files,
--                         list(kwargs['data_files']))
-+#    def test_handling_of_whitespace_in_data_files(self):
-+#        config = config_from_ini(self.config_text)
-+#        kwargs = util.setup_cfg_to_setup_kwargs(config)
-+#
-+#        self.assertEqual(self.data_files,
-+#                         list(kwargs['data_files']))
- 
- 
- class TestUTF8DescriptionFile(base.BaseTestCase):
--- 
-2.30.0
-