Release commit created with Cranko.

+++ cranko-release-info-v1
[[projects]]
qnames = ["pwkit", "pypa"]
version = "1.3.0"
age = 0

+++

Author: cranko

CHANGELOG.md

@@ -1,3 +1,21 @@
+# pwkit 1.3.0 (2025-04-25)
+
+- Add support for CASA 6! (#25, @pkgw). It's still incomplete, and there
+  may be some lingering bugs, but I am currently able to run most of my
+  processing pipeline on real VLA data.
+- In `imtool show`, pressing `f` or `p` will now fit a source at the position of
+  the mouse cursor. The `f` key will fit either a point or a Gaussian, depending
+  on what fits better; `p` will force a point-source fit.
+- Fix `pwkit.astutil.get_2mass_epoch` to use HTTPS to contact the Vizier API
+- More Numpy 2 compatibility fixes, including the use of `np.asarray` with a
+  `float` dtype instead of `np.asfarray`. This could potentially reduce
+  efficiency if the input was a `float32` and we're upgrading it to a `float64`.
+
+The DOI of this release is [10.5281/zenodo.15283107][vdoi].
+
+[vdoi]: https://doi.org/10.5281/zenodo.15283107
+
+
 # pwkit 1.2.2 (2024-10-11)
 
 - Correct fixup processing of args with non-None defaults in `pwkit.kwargv` (#24)

ci/zenodo.json5

@@ -30,13 +30,13 @@
     ],
     "language": "eng",
     "license": "MIT",
-    "publication_date": "2024-10-11",
-    "title": "pwkit 1.2.2",
+    "publication_date": "2025-04-25",
+    "title": "pwkit 1.3.0",
     "upload_type": "software",
-    "version": "1.2.2"
+    "version": "1.3.0"
   },
   "conceptdoi": "10.5281/zenodo.8052838",
-  "record_id": "13920308",
-  "doi": "10.5281/zenodo.13920308",
-  "bucket_link": "https://zenodo.org/api/files/0d206d5e-7361-4515-a15f-c30195b93dbb"
+  "record_id": "15283107",
+  "doi": "10.5281/zenodo.15283107",
+  "bucket_link": "https://zenodo.org/api/files/baf95e42-dfdc-4337-acbd-874b9931721b"
 }

docs/source/conf.py

@@ -11,7 +11,7 @@
 ]
 
 project = "pwkit"
-release = "1.2.2"  # cranko project-version
+release = "1.3.0"  # cranko project-version
 version = ".".join(release.split(".")[:2])
 
 copyright = "2015-2023, Peter K. G. Williams and collaborators"

docs/source/foundations/numerical.rst

@@ -72,8 +72,7 @@ Making functions that auto-broadcast their arguments
    array of the same shape as the argument(s).
 
    If *force_float* is true (the default), the input arrays will be converted to
-   floating-point types if necessary (with :func:`numpy.asfarray`) before being
-   passed to the function.
+   floating-point types if necessary before being passed to the function.
 
    Example::
 

pwkit/__init__.py

@@ -9,7 +9,7 @@
 
 __all__ = "Holder PKError binary_type reraise_context text_type unicode_to_str".split()
 
-__version__ = "1.2.2"  # cranko project-version
+__version__ = "1.3.0"  # cranko project-version
 
 # Archaic Python 2/3 compatibility support
 

pwkit/astimage.py

@@ -998,16 +998,21 @@ def delete(self):
 
 
 try:
-    import casac
+    import casatools  # CASA 6
 
     CASAImage = CasaCImage
 except ImportError:
     try:
-        from pyrap.images import image
+        import casac  # CASA 5
 
-        CASAImage = PyrapImage
+        CASAImage = CasaCImage
     except ImportError:
-        CASAImage = _CasaUnsupportedImage
+        try:
+            from pyrap.images import image  # ancient history
+
+            CASAImage = PyrapImage
+        except ImportError:
+            CASAImage = _CasaUnsupportedImage
 
 
 class FITSImage(AstroImage):

pwkit/astutil.py

@@ -846,7 +846,7 @@ def _observe_from_bcrs(self, observer):
     del Star, T0
 
 
-_vizurl = "http://vizier.u-strasbg.fr/viz-bin/asu-tsv"
+_vizurl = "https://vizier.u-strasbg.fr/viz-bin/asu-tsv"
 
 
 def get_2mass_epoch(tmra, tmdec, debug=False):

pwkit/cli/imtool.py

@@ -333,7 +333,7 @@ def _print(self, path):
         if im.toworld is not None:
             latax, lonax = im._latax, im._lonax
             delta = 1e-6
-            p = 0.5 * (np.asfarray(im.shape) - 1)
+            p = 0.5 * (np.asarray(im.shape, dtype=float) - 1)
             w1 = im.toworld(p)
             p[latax] += delta
             w2 = im.toworld(p)
@@ -346,7 +346,7 @@ def _print(self, path):
         if im.pclat is not None:
             print("center   =", fmtradec(im.pclon, im.pclat), "# pointing")
         elif im.toworld is not None:
-            w = im.toworld(0.5 * (np.asfarray(im.shape) - 1))
+            w = im.toworld(0.5 * (np.asarray(im.shape, dtype=float) - 1))
             print("center   =", fmtradec(w[lonax], w[latax]), "# lattice")
 
         if im.shape is not None:
@@ -429,7 +429,7 @@ def okeys(**kwargs):
         if im.toworld is not None:
             latax, lonax = im._latax, im._lonax
             delta = 1e-6
-            p = 0.5 * (np.asfarray(im.shape) - 1)
+            p = 0.5 * (np.asarray(im.shape, dtype=float) - 1)
             w1 = im.toworld(p)
             p[latax] += delta
             w2 = im.toworld(p)
@@ -446,7 +446,7 @@ def okeys(**kwargs):
                 lon=fmthours(im.pclon),
             )
         elif im.toworld is not None:
-            w = im.toworld(0.5 * (np.asfarray(im.shape) - 1))
+            w = im.toworld(0.5 * (np.asarray(im.shape, dtype=float) - 1))
             dest_section["center"] = okeys(
                 kind="lattice",
                 lat=fmtdeglat(w[latax]),
@@ -582,8 +582,41 @@ def invoke(self, args, **kwargs):
             if no_coords:
                 toworld = None
 
+            def extra_keypress_handler(
+                viewer: "Viewer", keyname: str, modmask: "Gdk.ModifierType"
+            ) -> bool:
+                if keyname in "fp" and int(modmask) == 0:
+                    # "f" - fit a source at current cursor position
+                    # "p" - same, forcing a point source
+                    from ..immodel import fit_one_source
+
+                    x, y = viewer.viewport.get_pointer_data_coords()
+                    x = int(round(x))
+                    y = int(
+                        round(img.shape[0] - 1 - y)
+                    )  # need to account for yflip here
+                    print(f"Fitting source at initial position: (x,y) = ({x!r}, {y!r})")
+
+                    def report_func(key: str, fmt: str, value):
+                        print(key, "=", fmt % value, sep="")
+
+                    fit_one_source(
+                        img,
+                        x,
+                        y,
+                        forcepoint=keyname == "p",
+                        report_func=report_func,
+                    )
+                    return True
+
+                return False
+
             ndshow.view(
-                data, title=path + " — Array Viewer", toworld=toworld, yflip=True
+                data,
+                title=path + " — Array Viewer",
+                toworld=toworld,
+                yflip=True,
+                extra_keypress_handler=extra_keypress_handler,
             )
 
         sys.exit(int(anyfailures))