Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address TODO in pyproject/tables #600

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 27 additions & 33 deletions src/poetry/core/pyproject/tables.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from contextlib import suppress
from functools import cached_property
from pathlib import Path
from typing import TYPE_CHECKING

Expand All @@ -9,7 +9,6 @@
from poetry.core.packages.dependency import Dependency


# TODO: Convert to dataclass once python 2.7, 3.5 is dropped
class BuildSystem:
def __init__(
self, build_backend: str | None = None, requires: list[str] | None = None
Expand All @@ -20,36 +19,31 @@ def __init__(
else "setuptools.build_meta:__legacy__"
)
self.requires = requires if requires is not None else ["setuptools", "wheel"]
self._dependencies: list[Dependency] | None = None

@property
@cached_property
def dependencies(self) -> list[Dependency]:
if self._dependencies is None:
# avoid circular dependency when loading DirectoryDependency
from poetry.core.packages.dependency import Dependency
from poetry.core.packages.directory_dependency import DirectoryDependency
from poetry.core.packages.file_dependency import FileDependency

self._dependencies = []
for requirement in self.requires:
dependency = None
try:
dependency = Dependency.create_from_pep_508(requirement)
except ValueError:
# PEP 517 requires can be path if not PEP 508
path = Path(requirement)
# compatibility Python < 3.8
# https://docs.python.org/3/library/pathlib.html#methods
with suppress(OSError):
if path.is_file():
dependency = FileDependency(name=path.name, path=path)
elif path.is_dir():
dependency = DirectoryDependency(name=path.name, path=path)

if dependency is None:
# skip since we could not determine requirement
continue

self._dependencies.append(dependency)

return self._dependencies
# avoid circular dependency when loading DirectoryDependency
from poetry.core.packages.dependency import Dependency
from poetry.core.packages.directory_dependency import DirectoryDependency
from poetry.core.packages.file_dependency import FileDependency

dependencies = []
for requirement in self.requires:
dependency = None
try:
dependency = Dependency.create_from_pep_508(requirement)
except ValueError:
# PEP 517 requires can be path if not PEP 508
path = Path(requirement)
if path.is_file():
dependency = FileDependency(name=path.name, path=path)
elif path.is_dir():
dependency = DirectoryDependency(name=path.name, path=path)

if dependency is None:
# skip since we could not determine requirement
continue

dependencies.append(dependency)

return dependencies
31 changes: 14 additions & 17 deletions src/poetry/core/pyproject/toml.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations

from contextlib import suppress
from functools import cached_property
from typing import TYPE_CHECKING
from typing import Any

Expand All @@ -16,7 +17,6 @@ class PyProjectTOML:
def __init__(self, path: Path) -> None:
self._path = path
self._data: dict[str, Any] | None = None
self._build_system: BuildSystem | None = None

@property
def path(self) -> Path:
Expand Down Expand Up @@ -46,23 +46,20 @@ def data(self) -> dict[str, Any]:

return self._data

@property
@cached_property
def build_system(self) -> BuildSystem:
if self._build_system is None:
build_backend = None
requires = None

if not self.path.exists():
build_backend = "poetry.core.masonry.api"
requires = ["poetry-core"]

container = self.data.get("build-system", {})
self._build_system = BuildSystem(
build_backend=container.get("build-backend", build_backend),
requires=container.get("requires", requires),
)

return self._build_system
build_backend = None
requires = None

if not self.path.exists():
build_backend = "poetry.core.masonry.api"
requires = ["poetry-core"]

container = self.data.get("build-system", {})
return BuildSystem(
build_backend=container.get("build-backend", build_backend),
requires=container.get("requires", requires),
)

@property
def poetry_config(self) -> dict[str, Any]:
Expand Down
Loading