From 0f6104670ac2e7399f5609ae690e46fc18cf218f Mon Sep 17 00:00:00 2001 From: Nora Loose Date: Mon, 16 Sep 2024 16:00:48 -0600 Subject: [PATCH] Move conftests.py to top level directory (#130) --- roms_tools/tests/test_setup/conftest.py => conftest.py | 0 roms_tools/tests/test_setup/test_boundary_forcing.py | 2 +- roms_tools/tests/test_setup/test_grid.py | 2 +- roms_tools/tests/test_setup/test_initial_conditions.py | 2 +- roms_tools/tests/test_setup/test_surface_forcing.py | 2 +- roms_tools/tests/test_setup/test_tides.py | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename roms_tools/tests/test_setup/conftest.py => conftest.py (100%) diff --git a/roms_tools/tests/test_setup/conftest.py b/conftest.py similarity index 100% rename from roms_tools/tests/test_setup/conftest.py rename to conftest.py diff --git a/roms_tools/tests/test_setup/test_boundary_forcing.py b/roms_tools/tests/test_setup/test_boundary_forcing.py index f0a39438..fc6367a6 100644 --- a/roms_tools/tests/test_setup/test_boundary_forcing.py +++ b/roms_tools/tests/test_setup/test_boundary_forcing.py @@ -3,7 +3,7 @@ from roms_tools import BoundaryForcing import textwrap from roms_tools.setup.download import download_test_data -from roms_tools.tests.test_setup.conftest import calculate_file_hash +from conftest import calculate_file_hash from pathlib import Path diff --git a/roms_tools/tests/test_setup/test_grid.py b/roms_tools/tests/test_setup/test_grid.py index 2c89f7f1..3394a008 100644 --- a/roms_tools/tests/test_setup/test_grid.py +++ b/roms_tools/tests/test_setup/test_grid.py @@ -4,7 +4,7 @@ import importlib.metadata import textwrap from roms_tools.setup.download import download_test_data -from roms_tools.tests.test_setup.conftest import calculate_file_hash +from conftest import calculate_file_hash from pathlib import Path diff --git a/roms_tools/tests/test_setup/test_initial_conditions.py b/roms_tools/tests/test_setup/test_initial_conditions.py index 0dafd61a..3c8ca6af 100644 --- a/roms_tools/tests/test_setup/test_initial_conditions.py +++ b/roms_tools/tests/test_setup/test_initial_conditions.py @@ -6,7 +6,7 @@ import textwrap from roms_tools.setup.download import download_test_data from roms_tools.setup.datasets import CESMBGCDataset -from roms_tools.tests.test_setup.conftest import calculate_file_hash +from conftest import calculate_file_hash from pathlib import Path diff --git a/roms_tools/tests/test_setup/test_surface_forcing.py b/roms_tools/tests/test_setup/test_surface_forcing.py index f2ff02d5..5475af62 100644 --- a/roms_tools/tests/test_setup/test_surface_forcing.py +++ b/roms_tools/tests/test_setup/test_surface_forcing.py @@ -3,7 +3,7 @@ from roms_tools import Grid, SurfaceForcing from roms_tools.setup.download import download_test_data import textwrap -from roms_tools.tests.test_setup.conftest import calculate_file_hash +from conftest import calculate_file_hash from pathlib import Path diff --git a/roms_tools/tests/test_setup/test_tides.py b/roms_tools/tests/test_setup/test_tides.py index 2620171a..983b3558 100644 --- a/roms_tools/tests/test_setup/test_tides.py +++ b/roms_tools/tests/test_setup/test_tides.py @@ -3,7 +3,7 @@ import xarray as xr from roms_tools.setup.download import download_test_data import textwrap -from roms_tools.tests.test_setup.conftest import calculate_file_hash +from conftest import calculate_file_hash from pathlib import Path