Skip to content

Commit f45ba82

Browse files
Alison WuAlison Wu
authored andcommitted
Merge branch 'resample-relocation' of https://github.com/alisnwu/diffpy.utils into resample-relocation
2 parents 2c364fc + 87a5b6d commit f45ba82

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tests/test_serialization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import numpy
44
import pytest
55

6-
from diffpy.utils.parsers.serializer import deserialize_data, serialize_data
7-
from diffpy.utils.parsers.data_loader import load_data
86
from diffpy.utils.parsers.custom_exceptions import ImproperSizeError, UnsupportedTypeError
7+
from diffpy.utils.parsers.data_loader import load_data
8+
from diffpy.utils.parsers.serializer import deserialize_data, serialize_data
99

1010
tests_dir = os.path.dirname(os.path.abspath(locals().get("__file__", "file.py")))
1111

0 commit comments

Comments
 (0)