drizzle 1.15.0__tar.gz → 1.15.2__tar.gz

drizzle-1.15.2/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "main"
+    schedule:
+      interval: monthly
+      time: "03:00"
+

{drizzle-1.15.0 → drizzle-1.15.2}/.github/workflows/build.yml

@@ -22,6 +22,7 @@ jobs:
         - cp3*-win32
         - cp3*-win_amd64
       sdist: true
+      test_command: python -c "from drizzle import cdrizzle"
     secrets:
       pypi_token: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER }}
 

{drizzle-1.15.0 → drizzle-1.15.2}/.github/workflows/ci.yml

@@ -23,7 +23,6 @@ jobs:
         - linux: check-style
         - linux: check-security
 
-        - linux: py39-xdist
         - linux: py310-xdist
         - linux: py311-xdist
         - macos: py312-xdist
@@ -44,7 +43,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.12'
     - name: Install and build

{drizzle-1.15.0 → drizzle-1.15.2}/CHANGES.rst

@@ -4,6 +4,19 @@
 Release Notes
 =============
 
+1.15.2 (2025-06-17)
+===================
+
+- build wheels with Numpy 2.0 release candidate [#149]
+
+
+1.15.1 (2024-03-05)
+===================
+
+- Fixed the warning type for the "gaussian", "lanczos2", and "lanczos3" kernels
+  (``DeprecationWarning`` to ``Warning``). [#141]
+
+
 1.15.0 (2024-02-16)
 ===================
 

{drizzle-1.15.0 → drizzle-1.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drizzle
-Version: 1.15.0
+Version: 1.15.2
 Summary: A package for combining dithered images into a single image
 Author-email: STScI <help@stsci.edu>
 License: Copyright (C) 2011,2014 Association of Universities for Research in
@@ -39,7 +39,7 @@ Project-URL: Homepage, https://github.com/spacetelescope/drizzle
 Project-URL: Bug Tracker, https://github.com/spacetelescope/drizzle/issues
 Project-URL: Documentation, http://spacetelescope.github.io/drizzle/
 Project-URL: Source Code, https://github.com/spacetelescope/drizzle
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
 Requires-Dist: numpy
@@ -91,7 +91,7 @@ the new GWCS code.
 Requirements
 ------------
 
-- Python 3.9 or later
+- Python 3.10 or later
 
 - Numpy
 

{drizzle-1.15.0 → drizzle-1.15.2}/README.rst

@@ -36,7 +36,7 @@ the new GWCS code.
 Requirements
 ------------
 
-- Python 3.9 or later
+- Python 3.10 or later
 
 - Numpy
 

{drizzle-1.15.0 → drizzle-1.15.2}/docs/conf.py

@@ -26,7 +26,6 @@
 # be accessible, and the documentation will not build correctly.
 
 import datetime
-import os
 import sys
 from pathlib import Path
 

{drizzle-1.15.0 → drizzle-1.15.2}/drizzle/tests/test_drizzle.py

@@ -642,3 +642,157 @@ def test_context_planes():
 
     driz.add_image(image, inwcs)
     assert driz.outcon.shape == (2, 10, 10)
+
+
+@pytest.mark.parametrize(
+    'kernel',
+    [
+        'square',
+        'point',
+        'turbo',
+        pytest.param(
+            'lanczos2',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+        pytest.param(
+            'lanczos3',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+        pytest.param(
+            'gaussian',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+    ],
+)
+def test_flux_conservation_nondistorted(kernel):
+    n = 200
+    in_shape = (n, n)
+
+    # input coordinate grid:
+    y, x = np.indices(in_shape, dtype=np.float64)
+
+    # simulate a gaussian "star":
+    fwhm = 2.9
+    x0 = 50.0
+    y0 = 68.0
+    sig = fwhm / (2.0 * np.sqrt(2.0 * np.log(2.0 * fwhm)))
+    sig2 = sig * sig
+    star = np.exp(-0.5 / sig2 * ((x.astype(np.float32) - x0)**2 + (y.astype(np.float32) - y0)**2))
+    in_sci = (star / np.sum(star)).astype(np.float32)  # normalize to 1
+    in_wht = np.ones(in_shape, dtype=np.float32)
+
+    # linear shift:
+    xp = x + 0.5
+    yp = y + 0.2
+
+    pixmap = np.dstack([xp, yp])
+
+    out_shape = (int(yp.max()) + 1, int(xp.max()) + 1)
+    # make sure distorion is not moving flux out of the image towards negative
+    # coordinates (just because of the simple way of how we account for output
+    # image size)
+    assert np.min(xp) > -0.5 and np.min(yp) > -0.5
+
+    out_sci = np.zeros(out_shape, dtype=np.float32)
+    out_ctx = np.zeros(out_shape, dtype=np.int32)
+    out_wht = np.zeros(out_shape, dtype=np.float32)
+
+    cdrizzle.tdriz(
+        in_sci,
+        in_wht,
+        pixmap,
+        out_sci,
+        out_wht,
+        out_ctx,
+        pixfrac=1.0,
+        scale=1.0,
+        kernel=kernel,
+        in_units="cps",
+        expscale=1.0,
+        wtscale=1.0,
+    )
+
+    assert np.allclose(
+        np.sum(out_sci * out_wht),
+        np.sum(in_sci),
+        atol=0.0,
+        rtol=0.0001,
+    )
+
+@pytest.mark.parametrize(
+    'kernel',
+    [
+        'square',
+        'point',
+        'turbo',
+        pytest.param(
+            'lanczos2',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+        pytest.param(
+            'lanczos3',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+        pytest.param(
+            'gaussian',
+            marks=pytest.mark.xfail(reason='Not a flux-conserving kernel'),
+        ),
+    ],
+)
+def test_flux_conservation_distorted(kernel):
+    n = 200
+    in_shape = (n, n)
+
+    # input coordinate grid:
+    y, x = np.indices(in_shape, dtype=np.float64)
+
+    # simulate a gaussian "star":
+    fwhm = 2.9
+    x0 = 50.0
+    y0 = 68.0
+    sig = fwhm / (2.0 * np.sqrt(2.0 * np.log(2.0 * fwhm)))
+    sig2 = sig * sig
+    star = np.exp(-0.5 / sig2 * ((x.astype(np.float32) - x0)**2 + (y.astype(np.float32) - y0)**2))
+    in_sci = (star / np.sum(star)).astype(np.float32)  # normalize to 1
+    in_wht = np.ones(in_shape, dtype=np.float32)
+
+    # linear shift:
+    xp = x + 0.5
+    yp = y + 0.2
+    # add distortion:
+    xp += 1e-4 * x**2 + 1e-5 * x * y
+    yp += 1e-3 * y**2 - 2e-5 * x * y
+
+    pixmap = np.dstack([xp, yp])
+
+    out_shape = (int(yp.max()) + 1, int(xp.max()) + 1)
+    # make sure distorion is not moving (pixels with) flux out of the image
+    # towards negative coordinates (just because of the simple way of how we
+    # account for output image size):
+    assert np.min(xp) > -0.5 and np.min(yp) > -0.5
+
+    out_sci = np.zeros(out_shape, dtype=np.float32)
+    out_ctx = np.zeros(out_shape, dtype=np.int32)
+    out_wht = np.zeros(out_shape, dtype=np.float32)
+
+    cdrizzle.tdriz(
+        in_sci,
+        in_wht,
+        pixmap,
+        out_sci,
+        out_wht,
+        out_ctx,
+        pixfrac=1.0,
+        scale=1.0,
+        kernel=kernel,
+        in_units="cps",
+        expscale=1.0,
+        wtscale=1.0,
+    )
+
+    assert np.allclose(
+        np.sum(out_sci * out_wht),
+        np.sum(in_sci),
+        atol=0.0,
+        rtol=0.0001,
+    )

{drizzle-1.15.0 → drizzle-1.15.2}/drizzle/tests/test_overlap_calc.py

@@ -9,7 +9,7 @@ from drizzle.cdrizzle import clip_polygon, invert_pixmap
 SQ2 = 1.0 / sqrt(2.0)
 
 
-def _is_poly_eq(p1, p2, rtol=0, atol=1e-12):
+def _is_poly_eq(p1, p2, rtol=0, atol=4e-12):
     if len(p1) != len(p2):
         return False
 

{drizzle-1.15.0 → drizzle-1.15.2}/drizzle.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drizzle
-Version: 1.15.0
+Version: 1.15.2
 Summary: A package for combining dithered images into a single image
 Author-email: STScI <help@stsci.edu>
 License: Copyright (C) 2011,2014 Association of Universities for Research in
@@ -39,7 +39,7 @@ Project-URL: Homepage, https://github.com/spacetelescope/drizzle
 Project-URL: Bug Tracker, https://github.com/spacetelescope/drizzle/issues
 Project-URL: Documentation, http://spacetelescope.github.io/drizzle/
 Project-URL: Source Code, https://github.com/spacetelescope/drizzle
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
 Requires-Dist: numpy
@@ -91,7 +91,7 @@ the new GWCS code.
 Requirements
 ------------
 
-- Python 3.9 or later
+- Python 3.10 or later
 
 - Numpy
 

{drizzle-1.15.0 → drizzle-1.15.2}/drizzle.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ pyproject.toml
 setup.py
 tox.ini
 .github/CODEOWNERS
+.github/dependabot.yml
 .github/workflows/build.yml
 .github/workflows/ci.yml
 /home/runner/work/drizzle/drizzle/src/cdrizzleapi.c

{drizzle-1.15.0 → drizzle-1.15.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "drizzle"
 description = "A package for combining dithered images into a single image"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [
     { name = "STScI", email = "help@stsci.edu" },
 ]
@@ -43,7 +43,7 @@ docs = [
 requires = [
     "setuptools>=61.2",
     "setuptools_scm[toml]>=3.4",
-    "numpy>=1.25",
+    "numpy>=2.0.0rc2",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -65,14 +65,16 @@ norecursedirs = [
 
 [tool.ruff]
 line-length = 100
-extend-select = [
+
+[tool.ruff.lint]
+select = [
     "F",
     "W",
     "E",
     "C4",
     "COM",
 ]
-extend-exclude = [
+exclude = [
     "docs",
     ".eggs",
     ".tox",

{drizzle-1.15.0 → drizzle-1.15.2}/setup.py

@@ -32,6 +32,8 @@ def get_extensions():
         cfg['define_macros'].append(('__STDC__', 1))
         cfg['define_macros'].append(('_CRT_SECURE_NO_WARNINGS', None))
 
+    # importing these extension modules is tested in `.github/workflows/build.yml`;
+    # when adding new modules here, make sure to add them to the `test_command` entry there
     return [Extension(str('drizzle.cdrizzle'), sources, **cfg)]
 
 

{drizzle-1.15.0 → drizzle-1.15.2}/src/cdrizzleapi.c

@@ -196,7 +196,7 @@ tdriz(PyObject *obj UNUSED_PARAM, PyObject *args, PyObject *keywords)
             kernel_str) < 1) {
           strcpy(warn_msg, "Selected kernel is not a flux-conserving kernel.");
       }
-      PyErr_WarnEx(PyExc_DeprecationWarning, warn_msg, 1);
+      PyErr_WarnEx(PyExc_Warning, warn_msg, 1);
   }
 
   if (pfract <= 0.001){

{drizzle-1.15.0 → drizzle-1.15.2}/tox.ini

@@ -19,7 +19,7 @@ changedir = {toxinidir}
 deps =
     ruff
 commands =
-    ruff . {posargs}
+    ruff check . {posargs}
 
 [testenv:check-security]
 description = run bandit to check security compliance