Skip to content

reparent example files properly #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rozyczko wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

reparent example files properly #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions tests/integration/test_ort_file_fitting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')
Expand Down
3 changes: 1 addition & 2 deletions tests/summary/test_summary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions tests/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@
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
from easyreflectometry.data.measurement import load_as_dataset
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):
Expand Down
3 changes: 1 addition & 2 deletions tests/test_fitting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions tests/test_measurement_comprehensive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions tests/test_orso_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions tests/test_orso_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions tests/test_ort_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
3 changes: 1 addition & 2 deletions tests/test_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions tests/unit/test_project_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading