From 4032a0f163f0641d010249aa2fb4169ec54624cc Mon Sep 17 00:00:00 2001 From: symscae Date: Thu, 28 May 2026 19:42:35 -0700 Subject: [PATCH 1/2] chore: updated dependencies --- .pre-commit-config.yaml | 6 +++--- news/dependency-update.rst | 23 +++++++++++++++++++++++ src/diffpy/__init__.py | 1 - src/diffpy/utils/parsers/serialization.py | 9 ++++----- src/diffpy/utils/resampler.py | 1 - src/diffpy/utils/wx/gridutils.py | 5 +++-- 6 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 news/dependency-update.rst diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f189a945..c424bcf7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: check-toml - id: check-added-large-files - repo: https://github.com/psf/black - rev: 26.3.1 + rev: 26.5.1 hooks: - id: black - repo: https://github.com/pycqa/flake8 @@ -29,7 +29,7 @@ repos: hooks: - id: flake8 - repo: https://github.com/pycqa/isort - rev: 8.0.1 + rev: 9.0.0a3 hooks: - id: isort args: ["--profile", "black"] @@ -59,7 +59,7 @@ repos: - "prettier@^3.2.4" # docformatter - PEP 257 compliant docstring formatter - repo: https://github.com/PyCQA/docformatter - rev: v1.7.7 + rev: v1.7.8 hooks: - id: docformatter additional_dependencies: [tomli] diff --git a/news/dependency-update.rst b/news/dependency-update.rst new file mode 100644 index 00000000..23f5b4a4 --- /dev/null +++ b/news/dependency-update.rst @@ -0,0 +1,23 @@ +**Added:** + +No news needed: updating docformatter, isort and black. Not user facing. + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/src/diffpy/__init__.py b/src/diffpy/__init__.py index 00208e23..99124eeb 100644 --- a/src/diffpy/__init__.py +++ b/src/diffpy/__init__.py @@ -21,7 +21,6 @@ Blank namespace package. """ - from pkgutil import extend_path __path__ = extend_path(__path__, __name__) diff --git a/src/diffpy/utils/parsers/serialization.py b/src/diffpy/utils/parsers/serialization.py index 5acbbe41..46e29d2e 100644 --- a/src/diffpy/utils/parsers/serialization.py +++ b/src/diffpy/utils/parsers/serialization.py @@ -33,9 +33,10 @@ def serialize_data( show_path=True, serial_file=None, ): - """Serialize file data into a dictionary. Can also save dictionary - into a serial language file. Dictionary is formatted as {filename: - data}. + """Serialize file data into a dictionary. + + Can also save dictionary into a serial language file. + Dictionary is formatted as {filename:data}. Requires hdata and data_table (can be generated by load_data). @@ -67,7 +68,6 @@ def serialize_data( dict: Returns the dictionary loaded from/into the updated database file. """ - # compile data_table and hddata together data = {} @@ -191,7 +191,6 @@ def deserialize_data(filename, filetype=None): dict A dictionary read from a serial file. """ - # check if supported type f = pathlib.Path(filename) f_name = f.name diff --git a/src/diffpy/utils/resampler.py b/src/diffpy/utils/resampler.py index 354eb37d..1e0f035d 100644 --- a/src/diffpy/utils/resampler.py +++ b/src/diffpy/utils/resampler.py @@ -141,7 +141,6 @@ def resample(r, s, dr): ------- Returns resampled ``(r, s)``. """ - warnings.warn( ( "The 'resample' function is deprecated and will be removed " diff --git a/src/diffpy/utils/wx/gridutils.py b/src/diffpy/utils/wx/gridutils.py index d94860ca..f585cc41 100644 --- a/src/diffpy/utils/wx/gridutils.py +++ b/src/diffpy/utils/wx/gridutils.py @@ -81,8 +81,9 @@ def getSelectedCells(grid): def limitSelectionToRows(grid, indices): - """Limit selection to the specified row indices. No action for empty - indices. + """Limit selection to the specified row indices. + + No action for empty indices. Parameters ---------- From cfd1c626043972475b1b9daf7cd57b19b2b6e7e9 Mon Sep 17 00:00:00 2001 From: symscae Date: Thu, 28 May 2026 19:53:04 -0700 Subject: [PATCH 2/2] fix news item --- news/dependency-update.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/dependency-update.rst b/news/dependency-update.rst index 23f5b4a4..abd1d67a 100644 --- a/news/dependency-update.rst +++ b/news/dependency-update.rst @@ -1,6 +1,6 @@ **Added:** -No news needed: updating docformatter, isort and black. Not user facing. +* No news needed: updating docformatter, isort and black. Not user facing. **Changed:**