Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/patch_glob.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* Removed glob of user home in load-image

**Fixed:**

* <news item>

**Security:**

* <news item>
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ template = "{tag}"
dev_template = "{tag}"
dirty_template = "{tag}"

[tool.setuptools]
package-dir = {"" = "src"}

[tool.setuptools.packages.find]
where = ["src"] # list of folders that contain the packages (["."] by default)
include = ["*"] # package names should match these glob patterns (["*"] by default)
Expand Down
14 changes: 3 additions & 11 deletions src/diffpy/srxplanar/loadimage.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,13 @@ def load_image(self, filename):
:param filename: str or Path, image file name or path
:return: 2D ndarray, flipped image array
"""
filename = Path(
filename
).expanduser() # handle "~", make it a Path object
if filename.exists():
filenamefull = filename
else:
found_files = list(Path.home().rglob(filename.name))
filenamefull = found_files[0] if found_files else None

if filenamefull is None or not filenamefull.exists():
filenamefull = Path(filename).resolve()

if not filenamefull.exists():
raise FileNotFoundError(
f"Error: file not found: {filename}, "
f"Please rerun specifying a valid filename."
)
return np.zeros((100, 100))

image = np.zeros((100, 100))
for _ in range(10): # retry 10 times (5 seconds total)
Expand Down
Loading