make asdf-astropy required

try another way to fix olddeps test

Author: nden

photutils/converters/apertures.py

@@ -14,10 +14,10 @@ class CircularApertureConverter(Converter):
     Base class for aperture converters.
     """
 
-    tags = ['tag:astropy.org:photutils/aperture/circular_aperture-*']
-    types = ['photutils.aperture.circle.CircularAperture']
+    tags = ['tag:astropy.org:photutils/aperture/circular_aperture-*']  # noqa: RUF012, E501
+    types = ['photutils.aperture.circle.CircularAperture']  # noqa: RUF012
 
-    def to_yaml_tree(self, obj, tag, ctx):
+    def to_yaml_tree(self, obj, tag, ctx):  # noqa: ARG002
         if obj.positions.shape == (2,):
             pos = obj.positions.tolist()
         else:
@@ -28,7 +28,7 @@ def to_yaml_tree(self, obj, tag, ctx):
             'r': obj.r,
         }
 
-    def from_yaml_tree(self, node, tag, ctx):
+    def from_yaml_tree(self, node, tag, ctx):  # noqa: ARG002
         from photutils.aperture.circle import CircularAperture
 
         return CircularAperture(

photutils/converters/functional_models.py

@@ -15,10 +15,10 @@ class AiryDiskPSFConverter(TransformConverterBase):
     Converter for AiryDiskPSF.
     """
 
-    tags = ['tag:astropy.org:photutils/psf/airy_disk_psf-*']
-    types = ['photutils.psf.AiryDiskPSF']
+    tags = ['tag:astropy.org:photutils/psf/airy_disk_psf-*']  # noqa: RUF012
+    types = ['photutils.psf.AiryDiskPSF']  # noqa: RUF012
 
-    def to_yaml_tree_transform(self, model, tag, ctx):
+    def to_yaml_tree_transform(self, model, tag, ctx):  # noqa: ARG002
         return {
             'flux': parameter_to_value(model.flux),
             'x_0': parameter_to_value(model.x_0),
@@ -27,7 +27,7 @@ def to_yaml_tree_transform(self, model, tag, ctx):
             'bbox_factor': model.bbox_factor,
         }
 
-    def from_yaml_tree_transform(self, node, tag, ctx):
+    def from_yaml_tree_transform(self, node, tag, ctx):  # noqa: ARG002
         from photutils.psf import AiryDiskPSF
 
         return AiryDiskPSF(

photutils/converters/tests/test_apertures.py

@@ -3,15 +3,14 @@
 """
 Tests for the photutils aperture converters.
 """
+import asdf
 import numpy as np
 
-import asdf
 from photutils.aperture import CircularAperture
 
-
 apertures = [
     CircularAperture(positions=[(1, 2), (3, 4)], r=5),
-    CircularAperture(positions=[(5, 6)], r=7),
+    CircularAperture(positions=(5, 6), r=7),
 ]
 
 
@@ -21,11 +20,11 @@ def test_aperture_converters(tmp_path):
     """
     for aperture in apertures:
         with asdf.AsdfFile() as af:
-            af["aperture"] = aperture
-            af.write_to(tmp_path / "aperture.asdf")
+            af['aperture'] = aperture
+            af.write_to(tmp_path / 'aperture.asdf')
 
-        with asdf.open(tmp_path / "aperture.asdf") as af:
-            aperture2 = af["aperture"]
+        with asdf.open(tmp_path / 'aperture.asdf') as af:
+            aperture2 = af['aperture']
 
         assert np.all(aperture.positions == aperture2.positions)
         assert aperture.r == aperture2.r

photutils/converters/tests/test_psf.py

@@ -3,17 +3,16 @@
 """
 Tests for the photutils PSF converters.
 """
-from astropy import units as u
 import asdf
+from astropy import units as u
 
 from photutils.psf import AiryDiskPSF
 
-
 psfs = [
-    AiryDiskPSF(flux=1*u.Jy, x_0=0*u.arcsec, y_0=0*u.arcsec,
-                radius=1*u.arcsec, bbox_factor=2),
-    AiryDiskPSF(flux=2*u.Jy, x_0=1*u.arcsec, y_0=1*u.arcsec,
-                radius=2*u.arcsec, bbox_factor=3),
+    AiryDiskPSF(flux=1 * u.Jy, x_0=0 * u.arcsec, y_0=0 * u.arcsec,
+                radius=1 * u.arcsec, bbox_factor=2),
+    AiryDiskPSF(flux=2 * u.Jy, x_0=1 * u.arcsec, y_0=1 * u.arcsec,
+                radius=2 * u.arcsec, bbox_factor=3),
 ]
 
 
@@ -23,11 +22,11 @@ def test_psf_converters(tmp_path):
     """
     for psf in psfs:
         with asdf.AsdfFile() as af:
-            af["psf"] = psf
-            af.write_to(tmp_path / "psf.asdf")
+            af['psf'] = psf
+            af.write_to(tmp_path / 'psf.asdf')
 
-        with asdf.open(tmp_path / "psf.asdf") as af:
-            psf2 = af["psf"]
+        with asdf.open(tmp_path / 'psf.asdf') as af:
+            psf2 = af['psf']
 
         assert psf.flux == psf2.flux
         assert psf.x_0 == psf2.x_0

photutils/resources/manifests/photutils-1.0.0.yaml

@@ -11,4 +11,4 @@ tags:
 - tag_uri: tag:astropy.org:photutils/psf/airy_disk_psf-1.0.0
   schema_uri: asdf://astropy.org/photutils/schemas/psf/airy_disk_psf-1.0.0
   title: AiryDiskPSF
-  description: ASDF schema for serializing a photutils AiryDiskPSF.
+  description: ASDF schema for serializing a photutils AiryDiskPSF.

photutils/resources/schemas/aperture/circular_aperture-1.0.0.yaml

@@ -41,4 +41,4 @@ properties:
       The radius of the circular aperture in pixels.
     type: number
 required: [positions, r]
-...
+...

photutils/resources/schemas/psf/airy_disk_psf-1.0.0.yaml

@@ -22,7 +22,7 @@ examples:
         radius: 5.0
         x_0: 24.3
         y_0: 25.2
-        
+
 
 allOf:
   - $ref: "http://stsci.edu/schemas/asdf/transform/transform-1.4.0"
@@ -53,4 +53,4 @@ allOf:
         description: Factor by which to multiply the radius to determine the size of the bounding box.
 
     required: [flux, x_0, y_0, radius]
-...
+...

pyproject.toml

@@ -33,9 +33,10 @@ classifiers = [
 dynamic = ['version']
 requires-python = '>=3.11'
 dependencies = [
-    'astropy >= 6.1.4',
+    'astropy >= 6.1.7',
     'numpy >= 2.0',
     'scipy >= 1.13',
+    'asdf-astropy>=0.10',
 ]
 
 [project.urls]
@@ -48,7 +49,6 @@ Documentation = 'https://photutils.readthedocs.io/en/stable/'
 
 [project.optional-dependencies]
 all = [
-    'asdf-astropy',
     'bottleneck >= 1.4',
     'gwcs >= 0.20',
     'matplotlib >= 3.9',
@@ -242,6 +242,8 @@ exclude = [
     '\._.*',  # private functions/methods
     '^test_*',  # test code
     '^conftest.*$',  # pytest configuration
+    'to_yaml_tree',  # ASDF converter
+    'from_yaml_tree',  # ASDF converter
 
     # PR01: private classes/functions
     'SigmaClipSentinelDefault$',