Skip to content

Commit 2559946

Browse files
authored
Merge pull request #164 from alisnwu/resampler-relocation
Move resampler out of parsers, remove relative paths for import
2 parents e9a7b2d + ccecf10 commit 2559946

File tree

6 files changed

+27
-11
lines changed

6 files changed

+27
-11
lines changed

news/resampler-relocation.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* <news item>
4+
5+
**Changed:**
6+
7+
* Moved resampler out of parsers, new path is diffpy.utils.resampler
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* Relative imports in parser's __init__.py
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

src/diffpy/utils/parsers/__init__.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,4 @@
1616
"""Various utilities related to data parsing and manipulation.
1717
"""
1818

19-
from .loaddata import loadData
20-
from .resample import resample
21-
from .serialization import deserialize_data, serialize_data
22-
23-
# silence the pyflakes syntax checker
24-
assert loadData or resample or True
25-
assert serialize_data or deserialize_data or True
26-
2719
# End of file
File renamed without changes.

tests/test_loaddata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import numpy
99
import pytest
1010

11-
from diffpy.utils.parsers import loadData
11+
from diffpy.utils.parsers.loaddata import loadData
1212

1313

1414
##############################################################################

tests/test_resample.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22
import pytest
33

4-
from diffpy.utils.parsers.resample import wsinterp
4+
from diffpy.utils.resampler import wsinterp
55

66

77
def test_wsinterp():

tests/test_serialization.py

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

6-
from diffpy.utils.parsers import deserialize_data, loadData, serialize_data
76
from diffpy.utils.parsers.custom_exceptions import ImproperSizeError, UnsupportedTypeError
7+
from diffpy.utils.parsers.loaddata import loadData
8+
from diffpy.utils.parsers.serialization import deserialize_data, serialize_data
89

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

0 commit comments

Comments
 (0)