Skip to content

Commit ef98af7

Browse files
sdispaterabn
authored andcommitted
Refactor access to the generate-setup-file configuration
1 parent 44c8a32 commit ef98af7

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

poetry/core/masonry/builders/sdist.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def build(self, target_dir=None): # type: (Path) -> Path
8989
else:
9090
tar.addfile(tar_info) # Symlinks & ?
9191

92-
if self._poetry.package.build_config.get("generate-setup-file", True):
92+
if self._poetry.package.build_should_generate_setup():
9393
setup = self.build_setup()
9494
tar_info = tarfile.TarInfo(pjoin(tar_dir, "setup.py"))
9595
tar_info.size = len(setup)

poetry/core/masonry/builders/wheel.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def build(self):
7777
with zipfile.ZipFile(
7878
os.fdopen(fd, "w+b"), mode="w", compression=zipfile.ZIP_DEFLATED
7979
) as zip_file:
80-
if not self._poetry.package.build_config.get("generate-setup-file", True):
80+
if not self._poetry.package.build_should_generate_setup():
8181
self._build(zip_file)
8282
self._copy_module(zip_file)
8383
else:
@@ -96,7 +96,7 @@ def build(self):
9696

9797
def _build(self, wheel):
9898
if self._package.build_script:
99-
if not self._poetry.package.build_config.get("generate-setup-file", True):
99+
if not self._poetry.package.build_should_generate_setup():
100100
# Since we have a build script but no setup.py generation is required,
101101
# we assume that the build script will build and copy the files
102102
# directly.

poetry/core/packages/project_package.py

+3
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,6 @@ def urls(self):
5858
urls.update(self.custom_urls)
5959

6060
return urls
61+
62+
def build_should_generate_setup(self): # type: () -> bool
63+
return self.build_config.get("generate-setup-file", True)

0 commit comments

Comments
 (0)