From 585d4ac02bd53183f12a7d725ee03dfd69578499 Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Fri, 25 Sep 2026 09:17:20 +0200 Subject: [PATCH] reparent example files properly --- tests/integration/test_ort_file_fitting.py | 3 +-- tests/summary/test_summary.py | 3 +-- tests/test_data.py | 3 +-- tests/test_fitting.py | 3 +-- tests/test_measurement_comprehensive.py | 3 +-- tests/test_orso_support.py | 3 +-- tests/test_orso_utils.py | 3 +-- tests/test_ort_file.py | 3 +-- tests/test_project.py | 3 +-- tests/unit/test_project_core.py | 3 +-- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/tests/integration/test_ort_file_fitting.py b/tests/integration/test_ort_file_fitting.py index 01176a09..86b1d743 100644 --- a/tests/integration/test_ort_file_fitting.py +++ b/tests/integration/test_ort_file_fitting.py @@ -18,7 +18,6 @@ import pytest from easyscience.fitting import AvailableMinimizers -import easyreflectometry from easyreflectometry.calculators import CalculatorFactory from easyreflectometry.data import load from easyreflectometry.fitting import MultiFitter @@ -29,7 +28,7 @@ from easyreflectometry.sample import Multilayer from easyreflectometry.sample import Sample -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(os.path.dirname(__file__)), '_static') @pytest.fixture(scope='module') diff --git a/tests/summary/test_summary.py b/tests/summary/test_summary.py index df1a7ac9..3564e2d2 100644 --- a/tests/summary/test_summary.py +++ b/tests/summary/test_summary.py @@ -8,12 +8,11 @@ import pytest from easyscience import global_object -import easyreflectometry from easyreflectometry import Project from easyreflectometry.model.resolution_functions import PercentageFwhm from easyreflectometry.summary import Summary -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(os.path.dirname(__file__)), '_static') class TestSummary: diff --git a/tests/test_data.py b/tests/test_data.py index eecace58..01e09174 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -13,7 +13,6 @@ from orsopy.fileio import Header from orsopy.fileio import load_orso -import easyreflectometry from easyreflectometry.data import DataSet1D from easyreflectometry.data.measurement import _load_txt from easyreflectometry.data.measurement import load @@ -21,7 +20,7 @@ from easyreflectometry.data.measurement import merge_datagroups from easyreflectometry.orso_utils import load_data_from_orso_file -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(__file__), '_static') class TestData(unittest.TestCase): diff --git a/tests/test_fitting.py b/tests/test_fitting.py index ddb12c77..b7147ef6 100644 --- a/tests/test_fitting.py +++ b/tests/test_fitting.py @@ -11,7 +11,6 @@ import scipp as sc from easyscience.fitting.minimizers.factory import AvailableMinimizers -import easyreflectometry from easyreflectometry.calculators import CalculatorFactory from easyreflectometry.data import DataSet1D from easyreflectometry.data.measurement import load @@ -25,7 +24,7 @@ from easyreflectometry.sample import Multilayer from easyreflectometry.sample import Sample -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(__file__), '_static') @pytest.mark.slow diff --git a/tests/test_measurement_comprehensive.py b/tests/test_measurement_comprehensive.py index 26cbebf8..7f6a8510 100644 --- a/tests/test_measurement_comprehensive.py +++ b/tests/test_measurement_comprehensive.py @@ -16,7 +16,6 @@ import pytest from numpy.testing import assert_array_equal -import easyreflectometry from easyreflectometry.data.data_store import DataSet1D from easyreflectometry.data.measurement import _load_txt from easyreflectometry.data.measurement import dataset_from_datagroup @@ -25,7 +24,7 @@ from easyreflectometry.data.measurement import merge_datagroups from easyreflectometry.orso_utils import load_data_from_orso_file -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(__file__), '_static') class TestMeasurementFunctions: diff --git a/tests/test_orso_support.py b/tests/test_orso_support.py index 0561c1a6..f3043f05 100644 --- a/tests/test_orso_support.py +++ b/tests/test_orso_support.py @@ -22,7 +22,6 @@ from orsopy.fileio.orso import OrsoDataset from orsopy.fileio.orso import save_orso -import easyreflectometry from easyreflectometry.data import DataSet1D from easyreflectometry.data import PolarizedDataSet from easyreflectometry.data.measurement import load @@ -43,7 +42,7 @@ from easyreflectometry.sample import Sample from easyreflectometry.sample.elements.materials.material_density import MaterialDensity -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(__file__), '_static') # The Qz/sQz grids the generated fixtures were built from (see task 7a). FIXTURE_QZ = np.linspace(0.01, 0.3, 12) diff --git a/tests/test_orso_utils.py b/tests/test_orso_utils.py index b9e3368e..bc8218c9 100644 --- a/tests/test_orso_utils.py +++ b/tests/test_orso_utils.py @@ -8,14 +8,13 @@ import pytest from orsopy.fileio import orso -import easyreflectometry from easyreflectometry.orso_utils import LoadOrso from easyreflectometry.orso_utils import _get_sld_values from easyreflectometry.orso_utils import load_data_from_orso_file from easyreflectometry.orso_utils import load_orso_data from easyreflectometry.orso_utils import load_orso_model -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(__file__), '_static') @pytest.fixture diff --git a/tests/test_ort_file.py b/tests/test_ort_file.py index fdaec79d..39a7ae7c 100644 --- a/tests/test_ort_file.py +++ b/tests/test_ort_file.py @@ -7,10 +7,9 @@ import numpy as np import pytest -import easyreflectometry from easyreflectometry.data import load -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(__file__), '_static') @pytest.fixture(scope='module') diff --git a/tests/test_project.py b/tests/test_project.py index cda8d9ec..693780e8 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -15,7 +15,6 @@ from easyscience.variable import Parameter from numpy.testing import assert_allclose -import easyreflectometry from easyreflectometry.data import DataSet1D from easyreflectometry.fitting import MultiFitter from easyreflectometry.model import Model @@ -29,7 +28,7 @@ from easyreflectometry.sample import Multilayer from easyreflectometry.sample import Sample -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(__file__), '_static') class TestProject: diff --git a/tests/unit/test_project_core.py b/tests/unit/test_project_core.py index 91383dbc..89e867e6 100644 --- a/tests/unit/test_project_core.py +++ b/tests/unit/test_project_core.py @@ -9,13 +9,12 @@ import pytest from easyscience import global_object -import easyreflectometry from easyreflectometry.data import DataSet1D from easyreflectometry.model import PercentageFwhm from easyreflectometry.model import Pointwise from easyreflectometry.project import Project -PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static') +PATH_STATIC = os.path.join(os.path.dirname(os.path.dirname(__file__)), '_static') @pytest.fixture(autouse=True)