drizzle 1.15.1__tar.gz → 1.15.3__tar.gz

drizzle-1.15.3/.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.1 → drizzle-1.15.3}/.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.1 → drizzle-1.15.3}/.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.1 → drizzle-1.15.3}/CHANGES.rst

@@ -4,6 +4,19 @@
 Release Notes
 =============
 
+1.15.3 (2024-08-19)
+===================
+
+- Fixed return type of ``PyInit_cdrizzle``. [#150]
+
+- Allow ``context`` to be ``None`` in ``tdriz``. [#151]
+
+
+1.15.2 (2024-06-17)
+===================
+
+- build wheels with Numpy 2.0 release candidate [#149]
+
 
 1.15.1 (2024-03-05)
 ===================

{drizzle-1.15.1 → drizzle-1.15.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drizzle
-Version: 1.15.1
+Version: 1.15.3
 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.13,>=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.1 → drizzle-1.15.3}/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.1 → drizzle-1.15.3}/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.1 → drizzle-1.15.3}/drizzle/tests/test_drizzle.py

@@ -796,3 +796,39 @@ def test_flux_conservation_distorted(kernel):
         atol=0.0,
         rtol=0.0001,
     )
+
+
+def test_no_context_array():
+    """
+    Test that providing None for "outctx" is supported.
+    """
+    # initialize input:
+    insci = np.ones((200, 400), dtype=np.float32)
+    inwht = np.ones((200, 400), dtype=np.float32)
+    inwht[:, 150:155] = 0
+
+    # initialize output:
+    outsci = np.zeros((210, 410), dtype=np.float32)
+    outwht = np.zeros((210, 410), dtype=np.float32)
+    outctx = None
+
+    # define coordinate mapping:
+    pixmap = np.moveaxis(np.mgrid[1:201, 1:401][::-1], 0, -1)
+
+    # resample:
+    cdrizzle.tdriz(
+        insci, inwht, pixmap,
+        outsci, outwht, outctx,
+        uniqid=1,
+        xmin=0, xmax=400,
+        ymin=0, ymax=200,
+        pixfrac=1,
+        kernel='square',
+        in_units='cps',
+        expscale=1,
+        wtscale=1,
+        fillstr='INDEF',
+    )
+
+    # check that no pixel with 0 weight has any counts:
+    assert np.sum(np.abs(outsci[(outwht == 0)])) == 0.0

{drizzle-1.15.1 → drizzle-1.15.3}/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.1 → drizzle-1.15.3}/drizzle.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drizzle
-Version: 1.15.1
+Version: 1.15.3
 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.13,>=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.1 → drizzle-1.15.3}/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.1 → drizzle-1.15.3}/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,<3.13"
 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.0",
 ]
 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.1 → drizzle-1.15.3}/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.1 → drizzle-1.15.3}/src/cdrizzleapi.c

@@ -130,11 +130,13 @@ tdriz(PyObject *obj UNUSED_PARAM, PyObject *args, PyObject *keywords)
     goto _exit;
   }
 
-  con = (PyArrayObject *)PyArray_ContiguousFromAny(ocon, NPY_INT32, 2, 2);
-  if (!con) {
-    driz_error_set_message(&error, "Invalid context array");
-    goto _exit;
-  }
+  if (ocon != Py_None) {
+    con = (PyArrayObject *)PyArray_ContiguousFromAny(ocon, NPY_INT32, 2, 2);
+    if (!con) {
+      driz_error_set_message(&error, "Invalid context array");
+      goto _exit;
+    }
+  };
 
   /* Convert t`he fill value string */
 
@@ -614,7 +616,7 @@ static struct PyModuleDef moduledef = {
     NULL
 };
 
-PyMODINIT_FUNC *PyInit_cdrizzle(void)
+PyMODINIT_FUNC PyInit_cdrizzle(void)
 {
     PyObject *m;
     m = PyModule_Create(&moduledef);

{drizzle-1.15.1 → drizzle-1.15.3}/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