Skip to content

Commit dc9d82e

Browse files
committed
TEST: Use relative imports in gifti tests
1 parent e1da57c commit dc9d82e

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

nibabel/gifti/tests/test_gifti.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,26 @@
66

77
import numpy as np
88

9-
import nibabel as nib
10-
from nibabel.gifti import (GiftiImage, GiftiDataArray, GiftiLabel,
11-
GiftiLabelTable, GiftiMetaData, GiftiNVPairs,
12-
GiftiCoordSystem)
13-
from nibabel.gifti.gifti import data_tag
14-
from nibabel.nifti1 import data_type_codes
15-
from nibabel.fileholders import FileHolder
16-
17-
from numpy.testing import (assert_array_almost_equal,
18-
assert_array_equal)
9+
from ... import load
10+
from .. import (GiftiImage, GiftiDataArray, GiftiLabel,
11+
GiftiLabelTable, GiftiMetaData, GiftiNVPairs,
12+
GiftiCoordSystem)
13+
from ..gifti import data_tag
14+
from ...nifti1 import data_type_codes
15+
from ...fileholders import FileHolder
16+
17+
from numpy.testing import assert_array_almost_equal, assert_array_equal
1918
import pytest
20-
from nibabel.testing import clear_and_catch_warnings, test_data
19+
from ...testing_pytest import clear_and_catch_warnings, test_data
2120
from .test_parse_gifti_fast import (DATA_FILE1, DATA_FILE2, DATA_FILE3,
2221
DATA_FILE4, DATA_FILE5, DATA_FILE6)
2322
import itertools
2423

2524

2625
def test_agg_data():
27-
surf_gii_img = nib.load(test_data('gifti', 'ascii.gii'))
28-
func_gii_img = nib.load(test_data('gifti', 'task.func.gii'))
29-
shape_gii_img = nib.load(test_data('gifti', 'rh.shape.curv.gii'))
26+
surf_gii_img = load(test_data('gifti', 'ascii.gii'))
27+
func_gii_img = load(test_data('gifti', 'task.func.gii'))
28+
shape_gii_img = load(test_data('gifti', 'rh.shape.curv.gii'))
3029
# add timeseries data with intent code ``none``
3130

3231
point_data = surf_gii_img.get_arrays_from_intent('pointset')[0].data
@@ -296,7 +295,7 @@ def assign_rgba(gl, val):
296295
def test_print_summary():
297296
for fil in [DATA_FILE1, DATA_FILE2, DATA_FILE3, DATA_FILE4,
298297
DATA_FILE5, DATA_FILE6]:
299-
gimg = nib.load(fil)
298+
gimg = load(fil)
300299
gimg.print_summary()
301300

302301

nibabel/gifti/tests/test_parse_gifti_fast.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
import numpy as np
1515

16-
import nibabel.gifti as gi
17-
from nibabel.gifti.util import gifti_endian_codes
18-
from nibabel.gifti.parse_gifti_fast import Outputter, parse_gifti_file
19-
from nibabel.loadsave import load, save
20-
from nibabel.nifti1 import xform_codes
21-
from nibabel.tmpdirs import InTemporaryDirectory
16+
from .. import gifti as gi
17+
from ..util import gifti_endian_codes
18+
from ..parse_gifti_fast import Outputter, parse_gifti_file
19+
from ...loadsave import load, save
20+
from ...nifti1 import xform_codes
21+
from ...tmpdirs import InTemporaryDirectory
2222

2323
from numpy.testing import assert_array_almost_equal
2424

2525
import pytest
26-
from ...testing import clear_and_catch_warnings
26+
from ...testing_pytest import clear_and_catch_warnings
2727

2828

2929
IO_DATA_PATH = pjoin(dirname(__file__), 'data')

0 commit comments

Comments
 (0)