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

Add isort/black check to github actions #464

Merged
merged 8 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from 7 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
10 changes: 10 additions & 0 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,16 @@ jobs:
- name: Run Pylint
run: make check-lint

# Run isort/black style check
- name: Run isort
run: isort --check-only --profile black ./smartsim ./tests

# Run isort/black style check
- name: Run black
run: |
black ./smartsim/version.py
black --check ./smartsim ./tests
MattToast marked this conversation as resolved.
Show resolved Hide resolved

# Run pytest (backends subdirectory)
- name: Run Pytest
if: (matrix.subset == 'backends')
Expand Down
12 changes: 4 additions & 8 deletions smartsim/_core/_install/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,12 +336,10 @@ class _RAIBuildDependency(ABC):

@property
@abstractmethod
def __rai_dependency_name__(self) -> str:
...
def __rai_dependency_name__(self) -> str: ...

@abstractmethod
def __place_for_rai__(self, target: t.Union[str, "os.PathLike[str]"]) -> Path:
...
def __place_for_rai__(self, target: t.Union[str, "os.PathLike[str]"]) -> Path: ...


def _place_rai_dep_at(
Expand Down Expand Up @@ -680,8 +678,7 @@ def _threaded_map(fn: t.Callable[[_T], _U], items: t.Iterable[_T]) -> t.Sequence
class _WebLocation(ABC):
@property
@abstractmethod
def url(self) -> str:
...
def url(self) -> str: ...


class _WebGitRepository(_WebLocation):
Expand Down Expand Up @@ -735,8 +732,7 @@ class _ExtractableWebArchive(_WebArchive, ABC):
@abstractmethod
def _extract_download(
self, download_path: Path, target: t.Union[str, "os.PathLike[str]"]
) -> None:
...
) -> None: ...

def extract(self, target: t.Union[str, "os.PathLike[str]"]) -> None:
with tempfile.TemporaryDirectory() as tmp_dir:
Expand Down
3 changes: 1 addition & 2 deletions smartsim/_core/control/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -875,8 +875,7 @@ def __init__(self, model: Model) -> None:
self.entities = [model]
self.batch_settings = model.batch_settings

def _initialize_entities(self, **kwargs: t.Any) -> None:
...
def _initialize_entities(self, **kwargs: t.Any) -> None: ...


def _look_up_launched_data(
Expand Down
6 changes: 3 additions & 3 deletions smartsim/_core/control/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ class LaunchedManifestBuilder(t.Generic[_T]):
_ensembles: t.List[t.Tuple[Ensemble, t.Tuple[t.Tuple[Model, _T], ...]]] = field(
default_factory=list, init=False
)
_databases: t.List[
t.Tuple[Orchestrator, t.Tuple[t.Tuple[DBNode, _T], ...]]
] = field(default_factory=list, init=False)
_databases: t.List[t.Tuple[Orchestrator, t.Tuple[t.Tuple[DBNode, _T], ...]]] = (
field(default_factory=list, init=False)
)

@property
def exp_telemetry_subdirectory(self) -> pathlib.Path:
Expand Down
6 changes: 2 additions & 4 deletions smartsim/_core/entrypoints/redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ def print_summary(
cmd: t.List[str], network_interface: str, shard_data: LaunchedShardData
) -> None:
print(
textwrap.dedent(
f"""\
textwrap.dedent(f"""\
----------- Running Command ----------
COMMAND: {' '.join(cmd)}
IPADDRESS: {shard_data.hostname}
Expand All @@ -90,8 +89,7 @@ def print_summary(

--------------- Output ---------------

"""
),
"""),
flush=True,
)

Expand Down
6 changes: 3 additions & 3 deletions smartsim/entity/dbobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
) -> None:
self.name = name
self.func = func
self.file: t.Optional[
Path
] = None # Need to have this explicitly to check on it
self.file: t.Optional[Path] = (

Check warning on line 52 in smartsim/entity/dbobject.py

View check run for this annotation

Codecov / codecov/patch

smartsim/entity/dbobject.py#L52

Added line #L52 was not covered by tests
None # Need to have this explicitly to check on it
)
if file_path:
self.file = self._check_filepath(file_path)
self.device = self._check_device(device)
Expand Down
6 changes: 3 additions & 3 deletions smartsim/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@

# constants
DEFAULT_DATE_FORMAT: t.Final[str] = "%H:%M:%S"
DEFAULT_LOG_FORMAT: t.Final[
str
] = "%(asctime)s %(hostname)s %(name)s[%(process)d] %(levelname)s %(message)s"
DEFAULT_LOG_FORMAT: t.Final[str] = (
"%(asctime)s %(hostname)s %(name)s[%(process)d] %(levelname)s %(message)s"
)
EXPERIMENT_LOG_FORMAT = DEFAULT_LOG_FORMAT.replace("s[%", "s {%(exp_path)s} [%")

# configure colored loggs
Expand Down
3 changes: 1 addition & 2 deletions tests/test_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ class MockStep(Step):
def _create_unique_name(name):
return name

def add_to_batch(self, step):
...
def add_to_batch(self, step): ...

def get_launch_cmd(self):
return []
Expand Down
8 changes: 2 additions & 6 deletions tests/test_dbnode.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ def test_launched_shard_info_can_be_serialized():
@pytest.mark.parametrize("limit", [None, 1])
def test_db_node_can_parse_launched_shard_info(limit):
rand_shards = [_random_shard_info() for _ in range(3)]
with io.StringIO(
textwrap.dedent(
"""\
with io.StringIO(textwrap.dedent("""\
This is some file like str
--------------------------

Expand All @@ -110,9 +108,7 @@ def test_db_node_can_parse_launched_shard_info(limit):
SMARTSIM_ORC_SHARD_INFO: {}

All other lines should be ignored.
"""
).format(*(json.dumps(s.to_dict()) for s in rand_shards))
) as stream:
""").format(*(json.dumps(s.to_dict()) for s in rand_shards))) as stream:
parsed_shards = DBNode._parse_launched_shard_info_from_iterable(stream, limit)
if limit is not None:
rand_shards = rand_shards[:limit]
Expand Down
Loading