From d21c2caf1dbd69ba630075e48254131499f01afe Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 8 Nov 2021 08:56:18 -0800 Subject: Clarify the need for setup.py with PEP517 There was a misunderstanding that PBRs PEP517 build hooks meant we no longer needed a setup.py. But it turns out the setuptools build_meta hooks that we wrap call out to setup.py. This means PBR will continue to need to be used in conjunction with a setup.py. This is better for backward compatibiltiy anyway so not a huge loss. Document this more properly and update the test to reflect it. Change-Id: If4320da1e89a5c765e0bfe56b724364f9cba34f3 --- pbr/tests/test_packaging.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pbr/tests/test_packaging.py') diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py index 7d55d54..a024f56 100644 --- a/pbr/tests/test_packaging.py +++ b/pbr/tests/test_packaging.py @@ -229,9 +229,6 @@ class CreatePackages(fixtures.Fixture): self.packages = packages def _writeFile(self, directory, file_name, contents): - if not contents: - # We want to be able to override not having files - return path = os.path.abspath(os.path.join(directory, file_name)) path_dir = os.path.dirname(path) if not os.path.exists(path_dir): @@ -924,6 +921,8 @@ class TestRequirementParsing(base.BaseTestCase): class TestPEP517Support(base.BaseTestCase): def test_pep_517_support(self): + # Note that the current PBR PEP517 entrypoints rely on a valid + # PBR setup.py existing. pkgs = { 'test_pep517': { @@ -931,8 +930,7 @@ class TestPEP517Support(base.BaseTestCase): sphinx iso8601 """), - # Override no setup.py. - 'setup.py': '', + # Use default PBR test setup.py. 'setup.cfg': textwrap.dedent("""\ [metadata] name = test_pep517 -- cgit v1.2.1