Skip to content

Commit bf27867

Browse files
committed
executor: remove redundant _prepare_directory_archive method
1 parent 5293b55 commit bf27867

File tree

1 file changed

+2
-23
lines changed

1 file changed

+2
-23
lines changed

src/poetry/installation/executor.py

+2-23
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ def _install(self, operation: Install | Update) -> int:
506506
elif package.source_type == "file":
507507
archive = self._prepare_archive(operation)
508508
elif package.source_type == "directory":
509-
archive = self._prepare_directory_archive(operation)
509+
archive = self._prepare_archive(operation)
510510
cleanup_archive = True
511511
elif package.source_type == "url":
512512
assert package.source_url is not None
@@ -578,27 +578,6 @@ def _prepare_archive(self, operation: Install | Update) -> Path:
578578

579579
return self._chef.prepare(archive, editable=package.develop)
580580

581-
def _prepare_directory_archive(self, operation: Install | Update) -> Path:
582-
package = operation.package
583-
operation_message = self.get_operation_message(operation)
584-
585-
message = (
586-
f" <fg=blue;options=bold>•</> {operation_message}:"
587-
" <info>Building...</info>"
588-
)
589-
self._write(operation, message)
590-
591-
assert package.source_url is not None
592-
if package.root_dir:
593-
req = package.root_dir / package.source_url
594-
else:
595-
req = Path(package.source_url).resolve(strict=False)
596-
597-
if package.source_subdirectory:
598-
req /= package.source_subdirectory
599-
600-
return self._prepare_archive(operation)
601-
602581
def _prepare_git_archive(self, operation: Install | Update) -> Path:
603582
from poetry.vcs.git import Git
604583

@@ -621,7 +600,7 @@ def _prepare_git_archive(self, operation: Install | Update) -> Path:
621600
original_url = package.source_url
622601
package._source_url = str(source.path)
623602

624-
archive = self._prepare_directory_archive(operation)
603+
archive = self._prepare_archive(operation)
625604

626605
package._source_url = original_url
627606

0 commit comments

Comments
 (0)