Merge pull request #264 from mwcraig/pydantic-2-upgrade

Pydantic 2 upgrade

pyproject.toml

@@ -19,13 +19,13 @@ dependencies = [
     "bottleneck",
     "ccdproc",
     "ginga",
-    "ipyautoui >=0.5.9",
+    "ipyautoui >=0.7",
     "ipyfilechooser",
     "ipywidgets",
     "matplotlib",
     "pandas",
     "photutils >=1.9",
-    "pydantic<2",
+    "pydantic >=2",
     "pyyaml",
 ]
 
@@ -155,4 +155,6 @@ filterwarnings = [
     'ignore:Passing unrecognized arguments to super:DeprecationWarning',
     # pandas will require pyarrow at some point, which is good to know, I guess...
     'ignore:[.\n]*Pyarrow will become a required dependency of pandas[.\n]*:DeprecationWarning',
+    # ipyautoui is generating this on import because they still have some pydantic changes to make
+    'ignore:Using extra keyword arguments on `Field` is deprecated:'
 ]

stellarphot/gui_tools/tests/test_seeing_profile.py

@@ -76,7 +76,7 @@ def test_seeing_profile_properties(tmp_path):
 
     # Check that the photometry apertures have defaulted to the
     # default values in the model.
-    assert profile_widget.aperture_settings.value == PhotometryApertures().dict()
+    assert profile_widget.aperture_settings.value == PhotometryApertures().model_dump()
 
     # Get the event handler that updates plots
     handler = profile_widget._make_show_event()
@@ -102,9 +102,7 @@ def test_seeing_profile_properties(tmp_path):
         new_radius = phot_aps["radius"] - 2
         # Change the radius by directly setting the value of the widget that holds
         # the value. That ends up being nested fairly deeply...
-        profile_widget.aperture_settings.autowidget.children[0].children[
-            0
-        ].value = new_radius
+        profile_widget.aperture_settings.di_widgets["radius"].value = new_radius
 
         # Make sure the settings are updated
         phot_aps["radius"] = new_radius

stellarphot/photometry/tests/test_photometry.py

@@ -87,7 +87,7 @@ def test_calc_noise_source_only(gain, aperture_area):
     expected = np.sqrt(gain * counts)
 
     # Create camera instance
-    camera = ZERO_CAMERA.copy()
+    camera = ZERO_CAMERA.model_copy()
     camera.gain = gain * camera.gain.unit
 
     np.testing.assert_allclose(
@@ -104,7 +104,7 @@ def test_calc_noise_dark_only(gain, aperture_area):
     exposure = 20
 
     # Create camera instance
-    camera = ZERO_CAMERA.copy()
+    camera = ZERO_CAMERA.model_copy()
     # Set gain and dark current to values for test
     camera.dark_current = dark_current * camera.dark_current.unit
     camera.gain = gain * camera.gain.unit
@@ -126,7 +126,7 @@ def test_calc_read_noise_only(gain, aperture_area):
     expected = np.sqrt(aperture_area * read_noise**2)
 
     # Create camera instance
-    camera = ZERO_CAMERA.copy()
+    camera = ZERO_CAMERA.model_copy()
     camera.read_noise = read_noise * camera.read_noise.unit
     camera.gain = gain * camera.gain.unit
 
@@ -143,7 +143,7 @@ def test_calc_sky_only(gain, aperture_area):
     expected = np.sqrt(gain * aperture_area * sky)
 
     # Create camera instance
-    camera = ZERO_CAMERA.copy()
+    camera = ZERO_CAMERA.model_copy()
     camera.gain = gain * camera.gain.unit
 
     np.testing.assert_allclose(
@@ -162,7 +162,7 @@ def test_annulus_area_term():
     expected = np.sqrt(gain * aperture_area * (1 + aperture_area / annulus_area) * sky)
 
     # Create camera instance
-    camera = ZERO_CAMERA.copy()
+    camera = ZERO_CAMERA.model_copy()
     camera.gain = gain * camera.gain.unit
 
     np.testing.assert_allclose(
@@ -192,7 +192,7 @@ def test_calc_noise_messy_case(digit, expected):
     read_noise = 12
 
     # Create camera instance
-    camera = ZERO_CAMERA.copy()
+    camera = ZERO_CAMERA.model_copy()
     camera.gain = gain * camera.gain.unit
     camera.dark_current = dark_current * camera.dark_current.unit
     camera.read_noise = read_noise * camera.read_noise.unit

stellarphot/settings/__init__.py

@@ -1,3 +1,2 @@
-from .autowidgets import *
 from .models import *
 from .views import *