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.

Sign up for GitHub

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

Jump to bottom

Fix stray type error in fs.py #10182

Merged
merged 4 commits into from Jun 27, 2020
Merged

Fix stray type error in fs.py #10182

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fc122f
Stray type error for some reason.
stuhood Jun 27, 2020
7adc521
Revert "Stray type error for some reason."
stuhood Jun 27, 2020
3db3269
Avoid cycle.
stuhood Jun 27, 2020
5927002
__eq__ and __hash__ again. Oof.
stuhood Jun 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/python/pants/engine/fs.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
import os
from dataclasses import dataclass
from pathlib import Path
from typing import TYPE_CHECKING, Iterable, Optional, Tuple
from typing import Any, Iterable, Optional, Tuple

from pants.engine.collection import Collection
from pants.engine.rules import RootRule, side_effecting
Expand All @@ -18,9 +18,6 @@
)
from pants.util.meta import frozen_after_init

if TYPE_CHECKING:
from pants.engine.internals.scheduler import SchedulerSession


@dataclass(frozen=True)
class FileContent:
Expand Down Expand Up @@ -285,11 +282,10 @@ class UrlToFetch:
class Workspace:
"""Abstract handle for operations that touch the real local filesystem."""

_scheduler: "SchedulerSession"
# TODO: SchedulerSession. Untyped because `fs.py` and `scheduler.py` have a cycle.
_scheduler: Any

def materialize_directory(
self, directory_to_materialize: DirectoryToMaterialize
) -> MaterializeDirectoryResult:
def materialize_directory(self, directory_to_materialize: DirectoryToMaterialize):
"""Materialize one single directory digest to disk.

If you need to materialize multiple, you should use the parallel materialize_directories()
Expand All @@ -299,7 +295,7 @@ def materialize_directory(

def materialize_directories(
self, directories_to_materialize: Tuple[DirectoryToMaterialize, ...]
) -> MaterializeDirectoriesResult:
):
"""Materialize multiple directory digests to disk in parallel."""
return self._scheduler.materialize_directories(directories_to_materialize)

Expand Down