Skip to content
Merged
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
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ testpaths = [
"docs",
]
addopts = "--doctest-modules --doctest-glob=*.rst"
log_cli_level = "INFO"

[tool.coverage.report]
omit = [
Expand Down
4 changes: 2 additions & 2 deletions src/hats_import/runtime_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import pandas as pd
from hats.catalog import TableProperties
from hats.io import file_io
from hats.io.validation import is_valid_catalog
from hats.io.validation import _is_catalog_info_valid
from hats.pixel_math import spatial_index
from upath import UPath

Expand Down Expand Up @@ -116,7 +116,7 @@ def _check_arguments(self):
raise ValueError("dask_threads_per_worker should be greater than 0")

self.catalog_path = file_io.get_upath(self.output_path) / self.output_artifact_name
if is_valid_catalog(self.catalog_path):
if _is_catalog_info_valid(self.catalog_path):
raise ValueError(f"Output path {self.catalog_path} already contains a valid catalog")
if not self.resume:
file_io.remove_directory(self.catalog_path, ignore_errors=True)
Expand Down
16 changes: 10 additions & 6 deletions tests/hats_import/verification/test_run_verification.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import logging

import pandas as pd
import pytest

Expand Down Expand Up @@ -75,19 +77,21 @@ def test_test_is_valid_catalog(small_sky_object_catalog, wrong_files_and_rows_di
assert not passed, "bad catalog passed"


def test_test_is_valid_collection(test_data_dir, tmp_path, capsys):
def test_test_is_valid_collection(test_data_dir, tmp_path, caplog, capsys):
"""`hats.is_valid_catalog` should pass for good catalogs, fail for catalogs without ancillary files."""
caplog.at_level(logging.INFO)
args = VerificationArguments(
input_catalog_path=test_data_dir / "small_sky_collection", output_path=tmp_path, verbose=True
)
verifier = runner.run(args)
passed = verifier.test_is_valid_catalog()
assert passed, "good catalog failed"
captured = capsys.readouterr().out
assert "Starting: Test hats.io.validation.is_valid_collection." in captured
assert "Validating collection at path" in captured
assert "Validating catalog at path" in captured
assert "Result: PASSED" in captured
captured_logs = caplog.text
captured_stdout = capsys.readouterr().out
assert "Starting: Test hats.io.validation.is_valid_collection." in captured_stdout
assert "Validating collection at path" in captured_logs
assert "Validating catalog at path" in captured_logs
assert "Result: PASSED" in captured_stdout


def test_test_num_rows(small_sky_object_catalog, wrong_files_and_rows_dir, tmp_path):
Expand Down
Loading