drizzle 1.14.2__tar.gz → 1.15.0__tar.gz

drizzle-1.15.0/.github/workflows/build.yml

@@ -0,0 +1,27 @@
+name: build
+
+on:
+  release:
+    types: [ released ]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@v1
+    with:
+      upload_to_pypi: ${{ (github.event_name == 'release') && (github.event.action == 'released') }}
+      targets: |
+        # Linux wheels
+        - cp3*-manylinux_x86_64
+        # MacOS wheels
+        - cp3*-macosx_x86_64
+        # Until we have arm64 runners, we can't automatically test arm64 wheels
+        - cp3*-macosx_arm64
+        # Windows wheels
+        - cp3*-win32
+        - cp3*-win_amd64
+      sdist: true
+    secrets:
+      pypi_token: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER }}
+

drizzle-1.15.0/.github/workflows/ci.yml

@@ -0,0 +1,60 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - '*.x'
+    tags:
+      - "*"
+  pull_request:
+  schedule:
+    - cron: '0 6 * * 1'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    with:
+      envs: |
+        - linux: check-style
+        - linux: check-security
+
+        - linux: py39-xdist
+        - linux: py310-xdist
+        - linux: py311-xdist
+        - macos: py312-xdist
+        - windows: py312-xdist
+        - linux: py312-xdist-cov
+          coverage: codecov
+
+        #- linux: py312-xdist-devdeps
+
+  # When py312-xdist-devdeps works again, we can remove this.
+  # When, you ask? Well, maybe after numpy 2.0 is released, maybe.
+  dev_deps_tests:
+    name: py312-devdeps
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.12'
+    - name: Install and build
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy>=0.0.dev0 --pre --upgrade
+        python -m pip install --extra-index-url https://pypi.anaconda.org/liberfa/simple pyerfa>=0.0.dev0 --pre --upgrade
+        python -m pip install --extra-index-url https://pypi.anaconda.org/astropy/simple astropy>=0.0.dev0 --pre --upgrade
+        python -m pip install --no-build-isolation -v -e .[test]
+    - name: Test with dev deps
+      run: |
+        pip freeze
+        pytest -v

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

@@ -4,8 +4,31 @@
 Release Notes
 =============
 
-.. 1.14.2 (unreleased)
-   ===================
+1.15.0 (2024-02-16)
+===================
+
+- Dropped Python 3.8. [#128]
+
+- Fixed a bug in the pixmap coordinate inversion routine. [#137]
+
+- Deprecated "tophat" kernel which will be remover in the next release. It is
+  not working correctly and should not be used. [#140]
+
+- Added warnings that "gaussian", "lanczos2", and "lanczos3" kernels are not
+  flux conserving. [#140]
+
+
+1.14.4 (2023-11-15)
+===================
+
+- N/A
+
+
+1.14.3 (2023-10-02)
+===================
+
+- Disable logging to fix a segfault on some systems. [#119]
+
 
 1.14.2 (2023-09-16)
 ===================

drizzle-1.15.0/MANIFEST.in

@@ -0,0 +1,14 @@
+include README.rst
+include CODE_OF_CONDUCT.md
+include pyproject.toml
+include LICENSE.rst
+
+recursive-include src *.c *.h
+recursive-include docs *
+
+prune build
+prune docs/_build
+prune docs/api
+prune drizzle/tests/data
+
+global-exclude *.pyc *.o

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

@@ -1,20 +1,51 @@
 Metadata-Version: 2.1
 Name: drizzle
-Version: 1.14.2
+Version: 1.15.0
 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
+        Astronomy (AURA)
+        
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions
+        are met:
+        
+            1. Redistributions of source code must retain the above
+              copyright notice, this list of conditions and the following
+              disclaimer.
+        
+            2. Redistributions in binary form must reproduce the above
+              copyright notice, this list of conditions and the following
+              disclaimer in the documentation and/or other materials
+              provided with the distribution.
+        
+            3. The name of AURA and its representatives may not be used to
+              endorse or promote products derived from this software without
+              specific prior written permission.
+        
+        THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR
+        IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+        ARE DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT,
+        INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+        HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+        STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+        OF THE POSSIBILITY OF SUCH DAMAGE.
+        
 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.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
+License-File: LICENSE.rst
 Requires-Dist: numpy
 Requires-Dist: astropy
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: coverage; extra == "test"
 Provides-Extra: docs
 Requires-Dist: tomli; python_version < "3.11" and extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
@@ -29,7 +60,7 @@ drizzle Documentation
     :target: http://www.astropy.org
     :alt: Powered by Astropy Badge
 
-.. image:: https://codecov.io/github/spacetelescope/drizzle/branch/master/graphs/badge.svg
+.. image:: https://codecov.io/github/spacetelescope/drizzle/branch/main/graphs/badge.svg
     :target: https://codecov.io/gh/spacetelescope/drizzle
     :alt: Drizzle's Coverage Status
 
@@ -37,6 +68,14 @@ drizzle Documentation
     :target: https://github.com/spacetelescope/drizzle/actions
     :alt: CI Status
 
+.. image:: https://readthedocs.org/projects/spacetelescope-drizzle/badge/?version=latest
+    :target: https://spacetelescope-drizzle.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation Status
+
+.. image:: https://img.shields.io/pypi/v/drizzle.svg
+    :target: https://pypi.org/project/drizzle
+    :alt: PyPI Status
+
 The ``drizzle`` library is a Python package for combining dithered images into a
 single image. This library is derived from code used in DrizzlePac. Like
 DrizzlePac, most of the code is implemented in the C language. The biggest
@@ -52,11 +91,11 @@ the new GWCS code.
 Requirements
 ------------
 
-- Python 3.6 or later
+- Python 3.9 or later
 
-- Numpy 1.13 or later
+- Numpy
 
-- Astropy 3.0 or later
+- Astropy
 
 The Drizzle Algorithm
 ---------------------

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

@@ -5,7 +5,7 @@ drizzle Documentation
     :target: http://www.astropy.org
     :alt: Powered by Astropy Badge
 
-.. image:: https://codecov.io/github/spacetelescope/drizzle/branch/master/graphs/badge.svg
+.. image:: https://codecov.io/github/spacetelescope/drizzle/branch/main/graphs/badge.svg
     :target: https://codecov.io/gh/spacetelescope/drizzle
     :alt: Drizzle's Coverage Status
 
@@ -13,6 +13,14 @@ drizzle Documentation
     :target: https://github.com/spacetelescope/drizzle/actions
     :alt: CI Status
 
+.. image:: https://readthedocs.org/projects/spacetelescope-drizzle/badge/?version=latest
+    :target: https://spacetelescope-drizzle.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation Status
+
+.. image:: https://img.shields.io/pypi/v/drizzle.svg
+    :target: https://pypi.org/project/drizzle
+    :alt: PyPI Status
+
 The ``drizzle`` library is a Python package for combining dithered images into a
 single image. This library is derived from code used in DrizzlePac. Like
 DrizzlePac, most of the code is implemented in the C language. The biggest
@@ -28,11 +36,11 @@ the new GWCS code.
 Requirements
 ------------
 
-- Python 3.6 or later
+- Python 3.9 or later
 
-- Numpy 1.13 or later
+- Numpy
 
-- Astropy 3.0 or later
+- Astropy
 
 The Drizzle Algorithm
 ---------------------

drizzle-1.15.0/drizzle/__init__.py

@@ -0,0 +1,11 @@
+"""
+A package for combining dithered images into a single image
+"""
+from importlib.metadata import PackageNotFoundError, version
+
+
+try:
+    __version__ = version(__name__)
+except PackageNotFoundError:
+    # package is not installed
+    __version__ = 'unknown'

{drizzle-1.14.2 → drizzle-1.15.0}/drizzle/dodrizzle.py

@@ -112,8 +112,11 @@ def dodrizzle(insci, input_wcs, inwht,
     kernel: str, optional
         The name of the kernel used to combine the input. The choice of
         kernel controls the distribution of flux over the kernel. The kernel
-        names are: "square", "gaussian", "point", "tophat", "turbo", "lanczos2",
-        and "lanczos3". The square kernel is the default.
+        names are: "square", "turbo", "point", "gaussian", "lanczos2",
+        and "lanczos3".
+
+        .. warning::
+            The "gaussian" and "lanczos2/3" kernels **DO NOT** conserve flux.
 
     fillval: str, optional
         The value a pixel is set to in the output if the input image does

{drizzle-1.14.2 → drizzle-1.15.0}/drizzle/drizzle.py

@@ -60,8 +60,11 @@ class Drizzle(object):
         kernel : str, optional
             The name of the kernel used to combine the inputs. The choice of
             kernel controls the distribution of flux over the kernel. The kernel
-            names are: "square", "gaussian", "point", "tophat", "turbo", "lanczos2",
-            and "lanczos3". The square kernel is the default.
+            names are: "square", "turbo", "point", "gaussian", "lanczos2",
+            and "lanczos3".
+
+            .. warning::
+              The "gaussian" and "lanczos2/3" kernels **DO NOT** conserve flux.
 
         fillval : str, otional
             The value a pixel is set to in the output if the input image does

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

@@ -8,11 +8,8 @@ from astropy.io import fits
 
 from drizzle import drizzle, cdrizzle
 
-
 TEST_DIR = os.path.abspath(os.path.dirname(__file__))
 DATA_DIR = os.path.join(TEST_DIR, 'data')
-
-
 ok = False
 
 
@@ -37,12 +34,11 @@ def centroid(image, size, center):
     xlo = int(center[1] - size / 2)
     xhi = min(xlo + size, image.shape[1])
 
-    center = [0.0, 0.0, 0.0]
-    for y in range(ylo, yhi):
-        for x in range(xlo, xhi):
-            center[0] += y * image[y,x]
-            center[1] += x * image[y,x]
-            center[2] += image[y,x]
+    yx1 = np.mgrid[ylo:yhi, xlo:xhi, 1:2]
+    center = (yx1[..., 0] * image[ylo:yhi, xlo:xhi]).sum(
+        axis=(1, 2),
+        dtype=np.float64,
+    )
 
     if center[2] == 0.0:
         return None
@@ -304,6 +300,7 @@ def test_square_with_grid(tmpdir):
     insci = read_image(input_file)
     inwcs = read_wcs(input_file)
     insci = make_grid_image(insci, 64, 100.0)
+
     inwht = np.ones(insci.shape,dtype=insci.dtype)
     output_wcs = read_wcs(output_template)
 

{drizzle-1.14.2 → drizzle-1.15.0}/drizzle/tests/test_file_io.py

@@ -8,7 +8,6 @@ from astropy.io import fits
 from drizzle import drizzle
 from drizzle import util
 
-
 TEST_DIR = os.path.abspath(os.path.dirname(__file__))
 DATA_DIR = os.path.join(TEST_DIR, 'data')
 

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

@@ -1,14 +1,11 @@
-import os
 import pytest
 from math import sqrt
+from itertools import product
 
 import numpy as np
 
 from drizzle.cdrizzle import clip_polygon, invert_pixmap
 
-
-TEST_DIR = os.path.abspath(os.path.dirname(__file__))
-DATA_DIR = os.path.join(TEST_DIR, 'data')
 SQ2 = 1.0 / sqrt(2.0)
 
 
@@ -74,6 +71,17 @@ def test_invert_pixmap():
         assert np.allclose(xyin, [xr, yr], atol=0.05)
 
 
+def test_invert_small_pixmap():
+    yin, xin = np.indices((2, 2), dtype=float)
+    pixmap = np.dstack([xin, yin])
+
+    test_coords = list(product(*(2 * [[-0.5, 1.5]])))
+
+    for xr, yr in test_coords:
+        xyin = invert_pixmap(pixmap, [xr, yr], [[-0.5, 1.5], [-0.5, 1.5]])
+        assert np.allclose(xyin, [xr, yr], atol=0.05)
+
+
 def test_poly_intersection_with_self():
     p = [(0, 0), (1, 0), (1, 1), (0, 1)]
 

{drizzle-1.14.2 → drizzle-1.15.0}/drizzle/tests/test_pixmap.py

@@ -1,4 +1,4 @@
-import os.path
+import os
 
 import numpy as np
 from numpy.testing import assert_equal, assert_almost_equal
@@ -7,7 +7,6 @@ from astropy.io import fits
 
 from drizzle import calc_pixmap
 
-
 TEST_DIR = os.path.abspath(os.path.dirname(__file__))
 DATA_DIR = os.path.join(TEST_DIR, 'data')
 

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

@@ -1,20 +1,51 @@
 Metadata-Version: 2.1
 Name: drizzle
-Version: 1.14.2
+Version: 1.15.0
 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
+        Astronomy (AURA)
+        
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions
+        are met:
+        
+            1. Redistributions of source code must retain the above
+              copyright notice, this list of conditions and the following
+              disclaimer.
+        
+            2. Redistributions in binary form must reproduce the above
+              copyright notice, this list of conditions and the following
+              disclaimer in the documentation and/or other materials
+              provided with the distribution.
+        
+            3. The name of AURA and its representatives may not be used to
+              endorse or promote products derived from this software without
+              specific prior written permission.
+        
+        THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR
+        IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+        ARE DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT,
+        INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+        HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+        STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+        ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+        OF THE POSSIBILITY OF SUCH DAMAGE.
+        
 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.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
+License-File: LICENSE.rst
 Requires-Dist: numpy
 Requires-Dist: astropy
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: coverage; extra == "test"
 Provides-Extra: docs
 Requires-Dist: tomli; python_version < "3.11" and extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
@@ -29,7 +60,7 @@ drizzle Documentation
     :target: http://www.astropy.org
     :alt: Powered by Astropy Badge
 
-.. image:: https://codecov.io/github/spacetelescope/drizzle/branch/master/graphs/badge.svg
+.. image:: https://codecov.io/github/spacetelescope/drizzle/branch/main/graphs/badge.svg
     :target: https://codecov.io/gh/spacetelescope/drizzle
     :alt: Drizzle's Coverage Status
 
@@ -37,6 +68,14 @@ drizzle Documentation
     :target: https://github.com/spacetelescope/drizzle/actions
     :alt: CI Status
 
+.. image:: https://readthedocs.org/projects/spacetelescope-drizzle/badge/?version=latest
+    :target: https://spacetelescope-drizzle.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation Status
+
+.. image:: https://img.shields.io/pypi/v/drizzle.svg
+    :target: https://pypi.org/project/drizzle
+    :alt: PyPI Status
+
 The ``drizzle`` library is a Python package for combining dithered images into a
 single image. This library is derived from code used in DrizzlePac. Like
 DrizzlePac, most of the code is implemented in the C language. The biggest
@@ -52,11 +91,11 @@ the new GWCS code.
 Requirements
 ------------
 
-- Python 3.6 or later
+- Python 3.9 or later
 
-- Numpy 1.13 or later
+- Numpy
 
-- Astropy 3.0 or later
+- Astropy
 
 The Drizzle Algorithm
 ---------------------

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

@@ -4,15 +4,15 @@
 .readthedocs.yaml
 CHANGES.rst
 CODE_OF_CONDUCT.md
+LICENSE.rst
 MANIFEST.in
 README.rst
-licenses
 pyproject.toml
 setup.py
 tox.ini
 .github/CODEOWNERS
+.github/workflows/build.yml
 .github/workflows/ci.yml
-.github/workflows/publish-to-pypi.yml
 /home/runner/work/drizzle/drizzle/src/cdrizzleapi.c
 /home/runner/work/drizzle/drizzle/src/cdrizzleblot.c
 /home/runner/work/drizzle/drizzle/src/cdrizzlebox.c
@@ -48,8 +48,6 @@ drizzle/tests/test_drizzle.py
 drizzle/tests/test_file_io.py
 drizzle/tests/test_overlap_calc.py
 drizzle/tests/test_pixmap.py
-licenses/LICENSE.rst
-licenses/README.rst
 src/cdrizzleapi.c
 src/cdrizzleblot.c
 src/cdrizzleblot.h

{drizzle-1.14.2 → drizzle-1.15.0}/drizzle.egg-info/requires.txt

@@ -12,5 +12,3 @@ tomli
 
 [test]
 pytest
-pytest-cov
-coverage

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

@@ -1,7 +1,7 @@
 [project]
 name = "drizzle"
 description = "A package for combining dithered images into a single image"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 authors = [
     { name = "STScI", email = "help@stsci.edu" },
 ]
@@ -18,7 +18,7 @@ file = "README.rst"
 content-type = "text/x-rst"
 
 [project.license]
-file = "licenses"
+file = "LICENSE.rst"
 content-type = "text/plain"
 
 [project.urls]
@@ -30,8 +30,6 @@ Documentation = "http://spacetelescope.github.io/drizzle/"
 [project.optional-dependencies]
 test = [
     "pytest",
-    "pytest-cov",
-    "coverage",
 ]
 docs = [
     "tomli; python_version<'3.11'",
@@ -45,8 +43,7 @@ docs = [
 requires = [
     "setuptools>=61.2",
     "setuptools_scm[toml]>=3.4",
-    "wheel",
-    "numpy",
+    "numpy>=1.25",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -58,7 +55,7 @@ include-package-data = false
 namespaces = false
 
 [tool.pytest.ini_options]
-minversion = "4.6"
+minversion = "6"
 norecursedirs = [
     "build",
     "docs/_build",

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

@@ -35,4 +35,6 @@ def get_extensions():
     return [Extension(str('drizzle.cdrizzle'), sources, **cfg)]
 
 
-setup(ext_modules=get_extensions())
+setup(
+    ext_modules=get_extensions(),
+)

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

@@ -84,6 +84,7 @@ tdriz(PyObject *obj UNUSED_PARAM, PyObject *args, PyObject *keywords)
   struct driz_error_t error;
   struct driz_param_t p;
   integer_t isize[2], psize[2], wsize[2];
+  char warn_msg[96];
 
   driz_log_handle = driz_log_init(driz_log_handle);
   driz_log_message("starting tdriz");
@@ -182,6 +183,22 @@ tdriz(PyObject *obj UNUSED_PARAM, PyObject *args, PyObject *keywords)
     goto _exit;
   }
 
+  if (kernel == kernel_tophat) {
+      if (sprintf(warn_msg,
+            "Kernel '%s' has been deprecated and it will be removed in a future release.",
+            kernel_str) < 1) {
+          strcpy(warn_msg, "Selected kernel has been deprecated and it will be removed in a future release.");
+      }
+      PyErr_WarnEx(PyExc_DeprecationWarning, warn_msg, 1);
+  } else if (kernel == kernel_gaussian || kernel == kernel_lanczos2 || kernel == kernel_lanczos3) {
+      if (sprintf(warn_msg,
+            "Kernel '%s' is not a flux-conserving kernel.",
+            kernel_str) < 1) {
+          strcpy(warn_msg, "Selected kernel is not a flux-conserving kernel.");
+      }
+      PyErr_WarnEx(PyExc_DeprecationWarning, warn_msg, 1);
+  }
+
   if (pfract <= 0.001){
     printf("kernel reset to POINT due to pfract being set to 0.0...\n");
     kernel_str2enum("point", &kernel, &error);

{drizzle-1.14.2 → drizzle-1.15.0}/src/cdrizzlemap.c

@@ -280,8 +280,8 @@ invert_pixmap(struct driz_param_t *par, double xout, double yout, double *xin,
     xmax = ((double)par->xmax) + 0.5;
     ymin = ((double)par->ymin) - 0.5;
     ymax = ((double)par->ymax) + 0.5;
-    dx = xmax;
-    dy = ymax;
+    dx = xmax - xmin;
+    dy = ymax - ymin;
 
     niter = 0;
 

{drizzle-1.14.2 → drizzle-1.15.0}/src/cdrizzleutil.h

@@ -177,8 +177,6 @@ driz_param_dump(struct driz_param_t* p);
 /****************************************************************************/
 /* LOGGING */
 
-#define LOGGING
-
 #ifdef LOGGING
 extern FILE *driz_log_handle;
 
@@ -203,24 +201,32 @@ driz_log_init(FILE *handle) {
         }
     }
     if (!p) {
-        sprintf(buf, "%ctmp%cdrizzle.log", dirsep, dirsep);
+        sprintf(buf, "drizzle.log");
     }
 
     handle = fopen(buf, "a");
-    setbuf(handle, 0);
+    if (handle) {
+        setbuf(handle, 0);
+    }
     return handle;
 }
 
 
 static inline_macro int
 driz_log_close(FILE *handle) {
-    return fclose(driz_log_handle);
+    if (handle) {
+        return fclose(handle);
+    }
 }
 
 static inline_macro int
 driz_log_message(const char* message) {
-    if (! driz_log_handle)
+    if (!driz_log_handle) {
         driz_log_handle = driz_log_init(driz_log_handle);
+        if (!driz_log_handle) {
+            return 1;
+        }
+    }
 
     fputs(message, driz_log_handle);
     fputs("\n", driz_log_handle);

drizzle-1.15.0/tox.ini

@@ -0,0 +1,60 @@
+[tox]
+env_list =
+    check-{style,security}
+    py{39,310,311,312}{,-xdist}{,-devdeps,-cov}
+
+# tox environments are constructed with so-called 'factors' (or terms)
+# separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor:
+# will only take effect if that factor is included in the environment name. To
+# see a list of example environments that can be run, along with a description,
+# run:
+#
+#     tox -l -v
+#
+
+[testenv:check-style]
+description = check code style
+skip_install = true
+changedir = {toxinidir}
+deps =
+    ruff
+commands =
+    ruff . {posargs}
+
+[testenv:check-security]
+description = run bandit to check security compliance
+skip_install = true
+changedir = {toxinidir}
+deps =
+    bandit>=1.7
+commands =
+    bandit drizzle -r -x drizzle/tests
+
+[testenv]
+description =
+    run tests
+    xdist: using parallel processing
+    devdeps: with development versions of dependencies
+    cov: with coverage
+
+# Cannot do isolated build because of the test data.
+package = editable
+
+passenv = HOME,WINDIR,LC_ALL,LC_CTYPE,CC,CI
+
+setenv =
+    devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/liberfa/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
+
+deps =
+    xdist: pytest-xdist
+    cov: pytest-cov
+    devdeps: numpy>=0.0.dev0
+    devdeps: pyerfa>=0.0.dev0
+    devdeps: astropy>=0.0.dev0
+
+commands =
+    pip freeze
+    pytest \
+    cov: --cov . --cov-config=.coveragerc --cov-report xml \
+    xdist: -n auto \
+    {posargs}

drizzle-1.14.2/.github/workflows/ci.yml

@@ -1,38 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: 
-      - master
-      - '*.x'
-    tags: 
-      - "*"
-  pull_request:
-  schedule:
-    - cron: '0 6 * * 1'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check:
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
-    with:
-      envs: |
-        - linux: check-style
-        - linux: check-security
-        - linux: build-dist
-  test:
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
-    with:
-      envs: |
-        - linux: py38-xdist
-        - linux: py39-xdist
-        - linux: py310-xdist
-        - linux: py311-xdist
-        - macos: py311-xdist
-        - windows: py311-xdist
-        - linux: py311-devdeps-xdist
-        - linux: py311-xdist-cov
-          coverage: codecov

drizzle-1.14.2/.github/workflows/publish-to-pypi.yml

@@ -1,16 +0,0 @@
-name: Publish to PyPI
-
-on:
-  release:
-    types: [released]
-
-jobs:
-  publish:
-    uses: spacetelescope/action-publish_to_pypi/.github/workflows/workflow.yml@master
-    with:
-      test: false
-      build_platform_wheels: true # Set to true if your package contains a C extension
-    secrets:
-      user: ${{ secrets.PYPI_USERNAME_STSCI_MAINTAINER }}
-      password: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER }} # WARNING: Do not hardcode secret values here! If you want to use a different user or password, you can override this secret by creating one with the same name in your Github repository settings.
-      test_password: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER_TEST }}

drizzle-1.14.2/MANIFEST.in

@@ -1,18 +0,0 @@
-include README.rst
-include CODE_OF_CONDUCT.md
-include setup.cfg
-
-recursive-include *.c *
-recursive-include *.pxd *
-recursive-include *.pyx *
-recursive-include docs *
-recursive-include licenses *
-recursive-include cextern *
-recursive-include scripts *
-
-prune build
-prune docs/_build
-prune docs/api
-prune drizzle/tests/data
-
-global-exclude *.pyc *.o

drizzle-1.14.2/drizzle/__init__.py

@@ -1,11 +0,0 @@
-"""
-A package for combining dithered images into a single image
-"""
-
-
-from pkg_resources import get_distribution, DistributionNotFound
-try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
-    # package is not installed
-    __version__ = 'unknown'

drizzle-1.14.2/licenses/README.rst

@@ -1,5 +0,0 @@
-Licenses
-========
-
-This directory holds license and credit information for the affiliated package,
-works the affiliated package is derived from, and/or datasets.

drizzle-1.14.2/tox.ini

@@ -1,70 +0,0 @@
-[tox]
-env_list =
-    check-{style,security,build}
-    test{,-warnings,-regtests}{,-cov}{,-xdist}
-    build-{docs,dist}
-
-# tox environments are constructed with so-called 'factors' (or terms)
-# separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor:
-# will only take effect if that factor is included in the environment name. To
-# see a list of example environments that can be run, along with a description,
-# run:
-#
-#     tox -l -v
-#
-
-[testenv:check-style]
-description = check code style, e.g. with flake8
-skip_install = true
-deps =
-    ruff
-commands =
-    ruff . {posargs}
-
-[testenv:check-security]
-description = run bandit to check security compliance
-skip_install = true
-deps =
-    bandit>=1.7
-commands =
-    bandit drizzle -r -x drizzle/tests
-
-[testenv]
-description =
-    run tests
-    warnings: treating warnings as errors
-    regtests: with --bigdata and --slow flags
-    cov: with coverage
-    xdist: using parallel processing
-package = editable
-set_env =
-    devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
-deps =
-    pytest
-    ci_watson
-    xdist: pytest-xdist
-    cov: pytest-cov
-commands_pre =
-    devdeps: pip install numpy>=0.0.dev0 git+https://github.com/astropy/astropy -U --upgrade-strategy eager
-    pip freeze
-commands =
-    pytest \
-    cov: --cov . --cov-report term-missing --cov-report xml \
-    warnings: -W error \
-    regtests: --bigdata --slow \
-    xdist: -n auto \
-    {posargs}
-
-[testenv:build-docs]
-description = invoke sphinx-build to build the HTML docs
-extras = docs
-commands =
-    sphinx-build docs/ docs/_build
-
-[testenv:build-dist]
-description = build wheel and sdist
-skip_install = true
-deps =
-    build
-commands =
-    python -m build .