From 08b1fcee1a2138cc869c4e31528b7ef6dd785e99 Mon Sep 17 00:00:00 2001 From: David Hotham Date: Sun, 2 Apr 2023 13:05:08 +0100 Subject: [PATCH] PyProjectTOML.toml_file -> PyProjectTOML.file --- src/poetry/console/commands/self/self_command.py | 2 +- src/poetry/installation/executor.py | 5 ++--- src/poetry/installation/pip_installer.py | 4 ++-- src/poetry/poetry.py | 2 +- src/poetry/pyproject/toml.py | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/poetry/console/commands/self/self_command.py b/src/poetry/console/commands/self/self_command.py index 838511b60c8..db626f1ed4e 100644 --- a/src/poetry/console/commands/self/self_command.py +++ b/src/poetry/console/commands/self/self_command.py @@ -78,7 +78,7 @@ def generate_system_pyproject(self) -> None: content["tool"]["poetry"][key] = preserved[key] # type: ignore[index] pyproject = PyProjectTOML(self.system_pyproject) - pyproject.toml_file.write(content) + pyproject.file.write(content) def reset_poetry(self) -> None: with directory(self.system_pyproject.parent): diff --git a/src/poetry/installation/executor.py b/src/poetry/installation/executor.py index 5e4a53188cd..fc3efe37059 100644 --- a/src/poetry/installation/executor.py +++ b/src/poetry/installation/executor.py @@ -636,9 +636,8 @@ def _prepare_git_archive(self, operation: Install | Update) -> Path: def _install_directory_without_wheel_installer( self, operation: Install | Update ) -> int: - from poetry.core.pyproject.toml import PyProjectTOML - from poetry.factory import Factory + from poetry.pyproject.toml import PyProjectTOML package = operation.package operation_message = self.get_operation_message(operation) @@ -663,7 +662,7 @@ def _install_directory_without_wheel_installer( package_poetry = None if pyproject.is_poetry_project(): with contextlib.suppress(RuntimeError): - package_poetry = Factory().create_poetry(pyproject.file.parent) + package_poetry = Factory().create_poetry(pyproject.file.path.parent) if package_poetry is not None: # Even if there is a build system specified diff --git a/src/poetry/installation/pip_installer.py b/src/poetry/installation/pip_installer.py index 97c453a6584..65c91bd15e3 100644 --- a/src/poetry/installation/pip_installer.py +++ b/src/poetry/installation/pip_installer.py @@ -11,9 +11,9 @@ from typing import Any from poetry.core.constraints.version import Version -from poetry.core.pyproject.toml import PyProjectTOML from poetry.installation.base_installer import BaseInstaller +from poetry.pyproject.toml import PyProjectTOML from poetry.repositories.http_repository import HTTPRepository from poetry.utils._compat import encode from poetry.utils.helpers import remove_directory @@ -226,7 +226,7 @@ def install_directory(self, package: Package) -> str | int: package_poetry = None if pyproject.is_poetry_project(): with contextlib.suppress(RuntimeError): - package_poetry = Factory().create_poetry(pyproject.file.parent) + package_poetry = Factory().create_poetry(pyproject.file.path.parent) if package_poetry is not None: # Even if there is a build system specified diff --git a/src/poetry/poetry.py b/src/poetry/poetry.py index e17837895be..3cb227eaaaa 100644 --- a/src/poetry/poetry.py +++ b/src/poetry/poetry.py @@ -60,7 +60,7 @@ def pyproject(self) -> PyProjectTOML: @property def file(self) -> TOMLFile: # type: ignore[override] - return self.pyproject.toml_file + return self.pyproject.file @property def locker(self) -> Locker: diff --git a/src/poetry/pyproject/toml.py b/src/poetry/pyproject/toml.py index 22676e848c5..afa3bbf8da8 100644 --- a/src/poetry/pyproject/toml.py +++ b/src/poetry/pyproject/toml.py @@ -26,7 +26,7 @@ def __init__(self, path: Path) -> None: self._toml_document: TOMLDocument | None = None @property - def toml_file(self) -> TOMLFile: + def file(self) -> TOMLFile: # type: ignore[override] return self._toml_file @property @@ -35,7 +35,7 @@ def data(self) -> TOMLDocument: if not self._file.exists(): self._toml_document = TOMLDocument() else: - self._toml_document = self.toml_file.read() + self._toml_document = self.file.read() return self._toml_document @@ -52,7 +52,7 @@ def save(self) -> None: build_system["requires"] = self._build_system.requires build_system["build-backend"] = self._build_system.build_backend - self.toml_file.write(data=data) + self.file.write(data=data) def reload(self) -> None: self._toml_document = None