Skip to content

Commit d7a4a60

Browse files
committed
tests: Tweak conftest imports
1 parent 674762d commit d7a4a60

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

tests/test_operator.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
import sympy
88

99
import pytest
10-
from conftest import assert_structure, skipif
10+
11+
# Try-except required to allow for import of classes from this file
12+
# for testing in PRO
13+
try:
14+
from ..conftest import assert_structure, skipif
15+
except ImportError:
16+
from conftest import assert_structure, skipif
17+
1118
from devito import (Grid, Eq, Operator, Constant, Function, TimeFunction,
1219
SparseFunction, SparseTimeFunction, Dimension, error, SpaceDimension,
1320
NODE, CELL, dimensions, configuration, TensorFunction,

0 commit comments

Comments
 (0)