Skip to content

Commit

Permalink
Merge branch 'resample-relocation' of https://github.com/alisnwu/diff…
Browse files Browse the repository at this point in the history
…py.utils into resample-relocation
  • Loading branch information
Alison Wu authored and Alison Wu committed Nov 7, 2024
2 parents 2c364fc + 87a5b6d commit f45ba82
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/test_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import numpy
import pytest

from diffpy.utils.parsers.serializer import deserialize_data, serialize_data
from diffpy.utils.parsers.data_loader import load_data
from diffpy.utils.parsers.custom_exceptions import ImproperSizeError, UnsupportedTypeError
from diffpy.utils.parsers.data_loader import load_data
from diffpy.utils.parsers.serializer import deserialize_data, serialize_data

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

Expand Down

0 comments on commit f45ba82

Please sign in to comment.