Skip to content

Commit

Permalink
Merge branch 'main' into delucchi/index
Browse files Browse the repository at this point in the history
  • Loading branch information
delucchi-cmu committed Mar 27, 2024
2 parents b5ee570 + 7f5e6ca commit c2b1964
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
2 changes: 0 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ def small_sky_order1_dir_local(local_data_dir):
return os.path.join(local_data_dir, SMALL_SKY_ORDER1_DIR_NAME)


@pytest.fixture
def tmp_dir_cloud(example_cloud_path):
return os.path.join(example_cloud_path, "tmp")

Expand All @@ -69,7 +68,6 @@ def test_data_dir_cloud(example_cloud_path):
return os.path.join(example_cloud_path, "data")


@pytest.fixture
def almanac_dir_cloud(example_cloud_path):
return os.path.join(example_cloud_path, "data", ALMANAC_DIR_NAME)

Expand Down
1 change: 0 additions & 1 deletion tests/lsdb/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
XMATCH_CORRECT_FILE = "xmatch_correct.csv"


@pytest.fixture
def small_sky_xmatch_dir_cloud(example_cloud_path):
return os.path.join(example_cloud_path, "data", SMALL_SKY_XMATCH_NAME)

Expand Down

0 comments on commit c2b1964

Please sign in to comment.