wfc3tools 1.6.0__tar.gz → 1.6.1__tar.gz

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # automatically requests pull request reviews for files matching the given pattern; the last match takes precendence
 
-*       @spacetelescope/wfc3tools-maintainers
+*       @pllim

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/.github/dependabot.yml

@@ -7,8 +7,9 @@ updates:
     target-branch: "main"
     schedule:
       interval: monthly
-      time: "03:30"
     groups:
       actions:
         patterns:
           - "*"
+    cooldown:
+      default-days: 7

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v2
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@9f1fedda61294df4c004c05519a3fbf3b8e1f32f  # v2.3.1
     with:
       upload_to_pypi: ${{ (github.event_name == 'release') && (github.event.action == 'released') }}
     secrets:

wfc3tools-1.6.1/.github/workflows/tests.yml

@@ -0,0 +1,33 @@
+name: tests
+
+on:
+  push:
+    branches:
+      - main
+      - '*x'
+    tags:
+      - '*'
+  pull_request:
+  schedule:
+    # Weekly Wednesday 9AM build
+    - cron: "0 9 * * 3"
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@9f1fedda61294df4c004c05519a3fbf3b8e1f32f  # v2.3.1
+    with:
+      conda: true
+      envs: |
+        - linux: py311
+        - linux: py312
+        - macos: py313
+        # https://github.com/OpenAstronomy/github-actions-workflows/issues/342
+        #- linux: py314

wfc3tools-1.6.1/.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+ci:
+  autofix_prs: false
+  autoupdate_schedule: monthly
+
+repos:
+  # lint and format
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.14.14
+    hooks:
+      - id: ruff-check
+        args:
+          - --fix
+          - --show-fixes
+      - id: ruff-format

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/.readthedocs.yaml

@@ -3,9 +3,9 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: mambaforge-4.10
+    python: mambaforge-latest
 
 conda:
   environment: docs/rtd_environment.yaml

wfc3tools-1.6.1/.ruff.toml

@@ -0,0 +1,24 @@
+exclude = [
+    "docs",
+    ".tox",
+    ".eggs",
+    "build",
+    "__init__.py",
+]
+line-length = 127
+
+target-version = "py311"
+
+[format]
+quote-style = "double"
+indent-style = "space"
+
+[lint]
+select = [
+    "F401", # Module imported but unused
+    "F811", # Redefinition of unused
+    "I",    # isort
+]
+
+[lint.isort]
+known-first-party = ["wfc3tools"]

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/CHANGES.rst

@@ -1,3 +1,7 @@
+1.6.1 (2026-02-06)
+------------------
+- Maintenance release for CALDP build. No functional change.
+
 1.6.0 (2025-10-21)
 ------------------
 - Follow PEP621 to move build configuration pyproject.toml [#90]

{wfc3tools-1.6.0/wfc3tools.egg-info → wfc3tools-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wfc3tools
-Version: 1.6.0
+Version: 1.6.1
 Summary: Python Tools for HST WFC3 Data
 Author: STScI
 Project-URL: Homepage, http://wfc3tools.readthedocs.io/
@@ -23,31 +23,30 @@ Requires-Dist: scipy>=1.8.0
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: astroquery; extra == "tests"
+Requires-Dist: ci-watson; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-automodapi; extra == "docs"
-Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Requires-Dist: sphinx-rtd-theme>1.2.0; extra == "docs"
 Dynamic: license-file
 
 WFC3TOOLS
 =========
 
+.. image:: https://github.com/spacetelescope/wfc3tools/actions/workflows/tests.yml/badge.svg?branch=main
+    :target: https://github.com/spacetelescope/wfc3tools/actions/workflows/tests.yml
+    :alt: tests
+
 .. image:: https://readthedocs.org/projects/wfc3tools/badge/?version=latest
-    :target: http://wfc3tools.readthedocs.io/en/latest/?badge=latest
+    :target: https://wfc3tools.readthedocs.io/en/latest/?badge=latest
     :alt: Documentation Status
 
-.. image:: http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat
-    :target: http://www.astropy.org
+.. image:: https://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat
+    :target: https://www.astropy.org
     :alt: Powered by Astropy Badge
 
 
-For more information please see the `online documentation <http://wfc3tools.readthedocs.io/>`_.
-
-You can also display the docs locally after install, import ``wfc3tools`` and then issue the following command to display the help docs in your local browser:
-
-::
-
-    wfc3tools.display_help()
+For more information please see the `online documentation <https://wfc3tools.readthedocs.io/>`_.
 
 To install using pip:
 
@@ -73,19 +72,11 @@ or haven't used github before, please feel free to contact `HST Help Desk <https
 Feedback and feature requests?   Is there something missing you would like
 to see?  Please open an issue or contact `HST Help Desk <https://stsci.service-now.com/hst>`_.
 
-``wfc3tools`` follows the `Astropy Code of Conduct`_ and strives to provide a
+``wfc3tools`` follows the STScI Code of Conduct and strives to provide a
 welcoming community to all of our users and contributors.
 
-Want more information about how to make a contribution?  Take a look at
-the the astropy `contributing`_ and `developer`_ documentation.
-
 
 License
 -------
 
 ``wfc3tools`` is licensed under a 3-clause BSD style license (see the ``LICENSE.txt`` file).
-
-.. _AstroPy: http://www.astropy.org/
-.. _contributing: http://docs.astropy.org/en/stable/index.html#contributing
-.. _developer: http://docs.astropy.org/en/stable/index.html#developer-documentation
-.. _Astropy Code of Conduct:  http://www.astropy.org/about.html#codeofconduct

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/README.rst

@@ -1,22 +1,20 @@
 WFC3TOOLS
 =========
 
+.. image:: https://github.com/spacetelescope/wfc3tools/actions/workflows/tests.yml/badge.svg?branch=main
+    :target: https://github.com/spacetelescope/wfc3tools/actions/workflows/tests.yml
+    :alt: tests
+
 .. image:: https://readthedocs.org/projects/wfc3tools/badge/?version=latest
-    :target: http://wfc3tools.readthedocs.io/en/latest/?badge=latest
+    :target: https://wfc3tools.readthedocs.io/en/latest/?badge=latest
     :alt: Documentation Status
 
-.. image:: http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat
-    :target: http://www.astropy.org
+.. image:: https://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat
+    :target: https://www.astropy.org
     :alt: Powered by Astropy Badge
 
 
-For more information please see the `online documentation <http://wfc3tools.readthedocs.io/>`_.
-
-You can also display the docs locally after install, import ``wfc3tools`` and then issue the following command to display the help docs in your local browser:
-
-::
-
-    wfc3tools.display_help()
+For more information please see the `online documentation <https://wfc3tools.readthedocs.io/>`_.
 
 To install using pip:
 
@@ -42,19 +40,11 @@ or haven't used github before, please feel free to contact `HST Help Desk <https
 Feedback and feature requests?   Is there something missing you would like
 to see?  Please open an issue or contact `HST Help Desk <https://stsci.service-now.com/hst>`_.
 
-``wfc3tools`` follows the `Astropy Code of Conduct`_ and strives to provide a
+``wfc3tools`` follows the STScI Code of Conduct and strives to provide a
 welcoming community to all of our users and contributors.
 
-Want more information about how to make a contribution?  Take a look at
-the the astropy `contributing`_ and `developer`_ documentation.
-
 
 License
 -------
 
 ``wfc3tools`` is licensed under a 3-clause BSD style license (see the ``LICENSE.txt`` file).
-
-.. _AstroPy: http://www.astropy.org/
-.. _contributing: http://docs.astropy.org/en/stable/index.html#contributing
-.. _developer: http://docs.astropy.org/en/stable/index.html#developer-documentation
-.. _Astropy Code of Conduct:  http://www.astropy.org/about.html#codeofconduct

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/docs/rtd_environment.yaml

@@ -1,8 +1,6 @@
-name: rtd311
 channels:
  - conda-forge
 dependencies:
- - python=3.11
+ - python=3.13
  - pip
  - graphviz
- - sphinx_rtd_theme>1.2.0

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/pyproject.toml

@@ -38,11 +38,12 @@ Help = "https://hsthelp.stsci.edu"
 tests = [
     "pytest",
     "astroquery",
+    "ci-watson",
 ]
 docs = [
     "sphinx",
     "sphinx-automodapi",
-    "sphinx-rtd-theme",
+    "sphinx-rtd-theme>1.2.0",
 ]
 
 [build-system]
@@ -62,9 +63,3 @@ namespaces = false
 
 [tool.setuptools_scm]
 version_file = "wfc3tools/version.py"
-
-[tool.ruff]
-extend-ignore = [
-    "E501", # Line too long
-]
-line-length = 127

wfc3tools-1.6.1/tox.ini

@@ -0,0 +1,17 @@
+[tox]
+env_list =
+    py{311,312,313,314}
+isolated_build = True
+
+[testenv]
+description =
+    run tests
+extras = tests
+conda_deps =
+    hstcal
+conda_channels =
+    conda-forge
+commands_pre =
+    pip freeze
+commands =
+    pytest -v {posargs}

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/wfc3tools/calwf3.py

@@ -29,11 +29,13 @@ import subprocess
 
 # STSCI
 from stsci.tools import parseinput
+
 from .util import error_code
 
 
-def calwf3(input=None, printtime=False, save_tmp=False,
-           verbose=False, debug=False, parallel=True, version=False, log_func=print):
+def calwf3(
+    input=None, printtime=False, save_tmp=False, verbose=False, debug=False, parallel=True, version=False, log_func=print
+):
     """
     Run the calwf3.e executable as from the shell.
 
@@ -137,33 +139,32 @@ def calwf3(input=None, printtime=False, save_tmp=False,
 
     """
 
-    call_list = ['calwf3.e']
+    call_list = ["calwf3.e"]
     return_code = None
 
     if printtime:
-        call_list.append('-t')
+        call_list.append("-t")
 
     if save_tmp:
-        call_list.append('-s')
+        call_list.append("-s")
 
     if verbose:
-        call_list.append('-v')
+        call_list.append("-v")
 
     if version:
-        call_list.append('--version')
+        call_list.append("--version")
 
     if debug:
-        call_list.append('-d')
+        call_list.append("-d")
 
     if not parallel:
-        call_list.append('-1')
+        call_list.append("-1")
 
     infiles, dummy = parseinput.parseinput(input)
     if (len(parseinput.irafglob(input)) == 0) and not version:
         raise IOError("No valid image specified")
     if len(parseinput.irafglob(input)) > 1:
-        raise IOError("calwf3 can only accept 1 file for"
-                      "input at a time: {0}".format(infiles))
+        raise IOError("calwf3 can only accept 1 file forinput at a time: {0}".format(infiles))
 
     for image in infiles:
         if not os.path.exists(image):
@@ -180,7 +181,7 @@ def calwf3(input=None, printtime=False, save_tmp=False,
 
     if log_func is not None:
         for line in proc.stdout:
-            log_func(line.decode('utf8'))
+            log_func(line.decode("utf8"))
 
     return_code = proc.wait()
     ec = error_code(return_code)

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/wfc3tools/embedsub.py

@@ -1,13 +1,13 @@
-from .sub2full import sub2full
+import numpy
 
 # STDLIB
 from astropy.io import fits
-import os
-import numpy
 
 # STSCI
 from stsci.tools import parseinput
 
+from .sub2full import sub2full
+
 __taskname__ = "embedsub"
 
 
@@ -36,14 +36,13 @@ def embedsub(files):
 
     # process all the input subarrays
     for filename in infiles:
-
         # Make sure the input name conforms to normal style
-        if '_flt' not in filename:
+        if "_flt" not in filename:
             print("Warning: Can't properly parse '%s'; Skipping" % files)
 
         # Extract the root name and build SPT and output file names
-        root = filename[0:filename.find('_flt')]
-        full = root[0:len(root)-1] + 'f_flt.fits'
+        root = filename[0 : filename.find("_flt")]
+        full = root[0 : len(root) - 1] + "f_flt.fits"
 
         try:
             # open input file read-only
@@ -51,14 +50,13 @@ def embedsub(files):
         except EnvironmentError:
             print("Problem opening fits file %s" % (filename))
 
-        detector = flt[0].header['DETECTOR']
-        if 'UVIS' in detector:
+        detector = flt[0].header["DETECTOR"]
+        if "UVIS" in detector:
             uvis = True
 
         # compute subarray corners assuming the raw image location
         x1, x2, y1, y2 = sub2full(filename, fullExtent=True)[0]
-        print("Subarray image section [x1,x2,y1,y2] = [%d:%d,%d:%d]" % (x1, x2,
-                                                                        y1, y2))
+        print("Subarray image section [x1,x2,y1,y2] = [%d:%d,%d:%d]" % (x1, x2, y1, y2))
 
         if uvis:
             xaxis = uvis_full_x
@@ -74,44 +72,44 @@ def embedsub(files):
         err = numpy.zeros([xaxis, yaxis], dtype=numpy.float32)
         dq = numpy.zeros([xaxis, yaxis], dtype=numpy.int16) + 4
 
-        sci[y1-1:y2, x1-1:x2] = flt[1].data
-        err[y1-1:y2, x1-1:x2] = flt[2].data
-        dq[y1-1:y2, x1-1:x2] = flt[3].data
+        sci[y1 - 1 : y2, x1 - 1 : x2] = flt[1].data
+        err[y1 - 1 : y2, x1 - 1 : x2] = flt[2].data
+        dq[y1 - 1 : y2, x1 - 1 : x2] = flt[3].data
 
         if not uvis:
             samp = numpy.zeros([xaxis, yaxis], dtype=numpy.int16)
             time = numpy.zeros([xaxis, yaxis], dtype=numpy.float32)
-            samp[y1-1:y2, x1-1:x2] = flt[4].data
-            time[y1-1:y2, x1-1:x2] = flt[5].data
+            samp[y1 - 1 : y2, x1 - 1 : x2] = flt[4].data
+            time[y1 - 1 : y2, x1 - 1 : x2] = flt[5].data
 
         # Reset a few WCS values to make them appropriate for a
         # full-chip image
-        crpix1 = flt[1].header['CRPIX1']
-        crpix2 = flt[1].header['CRPIX2']
+        crpix1 = flt[1].header["CRPIX1"]
+        crpix2 = flt[1].header["CRPIX2"]
 
-        flt[1].header['sizaxis1'] = yaxis
-        flt[1].header['sizaxis2'] = xaxis
+        flt[1].header["sizaxis1"] = yaxis
+        flt[1].header["sizaxis2"] = xaxis
 
         for i in range(1, 4):
-            if 'CRPIX1' in flt[i].header:
-                flt[i].header['crpix1'] = crpix1 + x1 - 1
-                flt[i].header['crpix2'] = crpix2 + y1 - 1
-            if 'LTV1' in flt[i].header:
-                flt[i].header['ltv1'] = 0.0
-                flt[i].header['ltv2'] = 0.0
+            if "CRPIX1" in flt[i].header:
+                flt[i].header["crpix1"] = crpix1 + x1 - 1
+                flt[i].header["crpix2"] = crpix2 + y1 - 1
+            if "LTV1" in flt[i].header:
+                flt[i].header["ltv1"] = 0.0
+                flt[i].header["ltv2"] = 0.0
 
         # set the header value of SUBARRAY to False since it's now
         # regular size image
-        flt[0].header['SUBARRAY'] = False
-        
+        flt[0].header["SUBARRAY"] = False
+
         # Now write out the SCI, ERR, DQ extensions to the full-chip file
-        flt[1].data = sci 
+        flt[1].data = sci
         flt[2].data = err
         flt[3].data = dq
-        
+
         if not uvis:
             flt[4].data = samp
-            flt[5].data = time    
+            flt[5].data = time
 
         flt.writeto(full, overwrite=False)
 

{wfc3tools-1.6.0 → wfc3tools-1.6.1}/wfc3tools/pstack.py

@@ -42,16 +42,14 @@ Usage:
 """
 
 # STDLIB
-import os
-from astropy.io import fits
 import numpy as np
+from astropy.io import fits
 from matplotlib import pyplot as plt
 
 plt.ion()
 
 
-def pstack(filename, column=0, row=0, extname="sci", units="counts",
-           title=None, xlabel=None, ylabel=None, plot=True):
+def pstack(filename, column=0, row=0, extname="sci", units="counts", title=None, xlabel=None, ylabel=None, plot=True):
     """
     A function to plot the statistics of one pixels up the IR ramp image.
     Original implementation in the iraf nicmos package. Pixel values here are
@@ -139,28 +137,28 @@ def pstack(filename, column=0, row=0, extname="sci", units="counts",
 
         for i in range(1, nsamp, 1):
             if time:
-                yaxis[i-1] = myfile["SCI", i].header['SAMPTIME']
+                yaxis[i - 1] = myfile["SCI", i].header["SAMPTIME"]
             else:
                 # Numpy is row-major with array indices written row-first
                 # (lexicographical access order)
-                yaxis[i-1] = myfile[extname.upper(), i].data[row, column]
-                xaxis[i-1] = myfile["SCI", i].header['SAMPTIME']
+                yaxis[i - 1] = myfile[extname.upper(), i].data[row, column]
+                xaxis[i - 1] = myfile["SCI", i].header["SAMPTIME"]
 
                 # convert to countrate
                 if "rate" in units.lower() and "/" not in bunit.lower():
-                    exptime = myfile["SCI", i].header['SAMPTIME']
-                    yaxis[i-1] /= exptime
+                    exptime = myfile["SCI", i].header["SAMPTIME"]
+                    yaxis[i - 1] /= exptime
                 # convert to counts
                 if "counts" in units.lower() and "/" in bunit.lower():
-                    exptime = myfile["SCI", i].header['SAMPTIME']
-                    yaxis[i-1] *= exptime
+                    exptime = myfile["SCI", i].header["SAMPTIME"]
+                    yaxis[i - 1] *= exptime
 
     if not ylabel:
         if "rate" in units.lower():
             if "/" in bunit.lower():
                 ylabel = bunit
             else:
-                ylabel = bunit+" per second"
+                ylabel = bunit + " per second"
         else:
             if "/" in bunit:
                 stop_index = bunit.find("/")
@@ -177,8 +175,7 @@ def pstack(filename, column=0, row=0, extname="sci", units="counts",
             plt.xlabel("Sample time")
 
         if not title:
-            title = "%s   Pixel stack for col=%d, row=%d" % (filename, column,
-                                                             row)
+            title = "%s   Pixel stack for col=%d, row=%d" % (filename, column, row)
         plt.title(title)
 
         if time: