Skip to content
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

Jump to bottom

Remove photutils from Astroquery astrometry.net #3067

Merged
merged 5 commits into from
Jul 14, 2024
Merged

Remove photutils from Astroquery astrometry.net #3067

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ffcee7
Adding deprecation warning for code block and parameter to solve_from…
mfixstsci Jul 13, 2024
1f445f6
Updating deprecation message, uses warnings package and adding unused…
mfixstsci Jul 14, 2024
4e23354
Made addition to changelog and fixed typo in warning message
mfixstsci Jul 14, 2024
c675b0a
Wrap warning message with parentheses and remove slashes
mfixstsci Jul 14, 2024
5bfc66b
Formatting warning message to fit coding standards
mfixstsci Jul 14, 2024
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
5 changes: 5 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ New Tools and Services
Service fixes and enhancements
------------------------------

astrometry_net
^^^^^^^^^^^^^^

- Remove photutils from Astroquery astrometry.net [#3067]

alma
^^^^

Expand Down
8 changes: 8 additions & 0 deletions astroquery/astrometry_net/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@


import json
import warnings

from astropy.io import fits
from astropy.stats import sigma_clipped_stats
from astropy.coordinates import SkyCoord
from astropy.utils.decorators import AstropyDeprecationWarning, deprecated_renamed_argument

try:
from astropy.nddata import CCDData
Expand Down Expand Up @@ -331,6 +333,7 @@ def solve_from_source_list(self, x, y, image_width, image_height, *,
verbose=verbose,
return_submission_id=return_submission_id)

@deprecated_renamed_argument(("force_image_upload", "ra_dec_units"), (None, None), since="0.4.8")
def solve_from_image(self, image_file_path, *, force_image_upload=False,
ra_key=None, dec_key=None,
ra_dec_units=None,
Expand Down Expand Up @@ -412,6 +415,11 @@ def solve_from_image(self, image_file_path, *, force_image_upload=False,
cache=False,
files={'file': f})
else:
warning_msg = "Removing photutils functionality to obtain extracted positions list from " \
"AstrometryNetClass.solve_from_source_list. Users will need to " \
"submit pre-extracted catalog positions or a fits file for https://nova.astrometry.net/ " \
"to extract with their algorithm."
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick, but I would rephrase this a bit, as it's the user who sees this message not a third party.

Suggested change
warning_msg = "Removing photutils functionality to obtain extracted positions list from " \
"AstrometryNetClass.solve_from_source_list. Users will need to " \
"submit pre-extracted catalog positions or a fits file for https://nova.astrometry.net/ " \
"to extract with their algorithm."
warning_msg = ("Running photutils functionality within astroquery to obtain extracted positions list from "
"AstrometryNetClass.solve_from_source_list() is deprecated and will be removed in the next release. "
"You need to submit catalog positions or a fits file to obtain an astrometric solution using this service.")

warnings.warn(warning_msg, category=AstropyDeprecationWarning)
# Detect sources and delegate to solve_from_source_list
if _HAVE_CCDDATA:
# CCDData requires a unit, so provide one. It has absolutely
Expand Down
Loading