Skip to content

fix: import loadData and deserialize_data directly to adopt new API from diffpy.utils(3.6.0) #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbillinge merged 3 commits into from
Feb 9, 2025
Merged

fix: import loadData and deserialize_data directly to adopt new API from diffpy.utils(3.6.0) #162

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa8d8e0
fix: use new `parsers` api
ycexiao Feb 8, 2025
f256631
docs: update news
ycexiao Feb 8, 2025
bb67d96
docs: add `fix` news
ycexiao Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions news/new_parser_api.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* import `loadData` and `deserialize_data` directly to integrate with `diffpy.utils(3.6.0)`
Copy link
Contributor

@sbillinge sbillinge Feb 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please move to fixed. this is a fix (bug) not a change (change in behavior of the program that users need to know about)

Copy link
Collaborator Author

@ycexiao ycexiao Feb 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. Updates have been pushed.


**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>
11 changes: 6 additions & 5 deletions src/diffpy/pdfmorph/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

import numpy

import diffpy.utils.parsers as parsers
from diffpy.utils.parsers.loaddata import loadData
from diffpy.utils.parsers.serialization import deserialize_data


def estimateScale(y_morph_in, y_target_in):
Expand Down Expand Up @@ -117,7 +118,7 @@ def readPDF(fname):
Arrays read from data.
"""

rv = parsers.loaddata.loadData(fname, unpack=True)
rv = loadData(fname, unpack=True)
if len(rv) >= 2:
return rv[:2]
return (None, None)
Expand Down Expand Up @@ -145,7 +146,7 @@ def deserialize(serial_file):
dict
Data read from serial file.
"""
return parsers.serialization.deserialize_data(serial_file)
return deserialize_data(serial_file)


def case_insensitive_dictionary_search(key: str, dictionary: dict):
Expand Down Expand Up @@ -199,11 +200,11 @@ def field_sort(filepaths: list, field, reverse=False, serfile=None, get_field_va
files_field_values = []
if serfile is None:
for path in filepaths:
fhd = parsers.loaddata.loadData(path, headers=True)
fhd = loadData(path, headers=True)
files_field_values.append([path, case_insensitive_dictionary_search(field, fhd)])
else:
# deserialize the serial file
des_dict = parsers.serialization.deserialize_data(serfile)
des_dict = deserialize_data(serfile)

# get names of each file to search the serial file
import pathlib
Expand Down
Loading