Skip to content

Commit

Permalink
Fixed confset duble function definition
Browse files Browse the repository at this point in the history
  • Loading branch information
mihaiboldeanu committed Dec 5, 2023
1 parent 479ab7f commit b622fa5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions echopype/testing.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import os
from pathlib import Path

HERE = Path(__file__).parent.absolute()
TEST_DATA_FOLDER = HERE / "test_data"
# HERE = Path(__file__).parent.absolute()
# TEST_DATA_FOLDER = HERE / "test_data"
current_directory = os.path.dirname(os.path.abspath(__file__))
TEST_DATA_FOLDER = os.path.join(current_directory, "..", "test_data")
TEST_DATA_FOLDER = Path(TEST_DATA_FOLDER)
4 changes: 2 additions & 2 deletions echopype/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def setup_test_data_jr179():
file_name = "JR179-D20080410-T150637.raw"
return _setup_file(file_name)


"""
def _setup_file(file_name):
test_data_path = os.path.join(TEST_DATA_FOLDER, file_name)
FTP_MAIN = "ftp://ftp.bas.ac.uk"
Expand All @@ -115,7 +115,7 @@ def _setup_file(file_name):
subprocess.run(["wget", ftp_file_path, "-O", test_data_path])
return test_data_path

"""

# Separate Sv dataset fixtures for each file
@pytest.fixture(scope="session")
Expand Down

0 comments on commit b622fa5

Please sign in to comment.