Skip to content

Upgrading fermipy to numpy>2 and astropy>7 #679

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

Open
facero wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −1
Open

Upgrading fermipy to numpy>2 and astropy>7 #679

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c495fd
replace np.string_ (deprecated in numpy 2)
facero Jun 25, 2026
f8ccae5
Fix astropy >6 handling of table.join()
facero Jun 25, 2026
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
15 changes: 14 additions & 1 deletion fermipy/catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@ def join_tables(left, right, key_left, key_right,
if key_left not in cols_right:
cols_right += [key_left]

# Fill missing (masked) values in key columns before joining (astropy >6
# raises TableMergeError if key columns have missing values).
for tbl in [left, right]:
if key_left in tbl.colnames:
col = tbl[key_left]
if hasattr(col, 'mask') and col.mask.any():
if col.dtype.kind in ['S', 'U']:
tbl[key_left] = col.filled('')
elif col.dtype.kind in ['i']:
tbl[key_left] = col.filled(0)
else:
tbl[key_left] = col.filled(np.nan)

out = join(left, right[cols_right], keys=key_left,
join_type='left')

Expand All @@ -85,7 +98,7 @@ def row_to_dict(row):
o = {}
for colname in row.colnames:

if isinstance(row[colname], np.string_) and row[colname].dtype.kind in ['S', 'U']:
if isinstance(row[colname], (np.bytes_, np.str_)) and row[colname].dtype.kind in ['S', 'U']:
o[colname] = str(row[colname])
else:
o[colname] = row[colname]
Expand Down
Loading