Merge branch 'main' into Update_stwcs_pin_01_15_25

.github/pull_request_template.md

@@ -12,6 +12,4 @@ This PR addresses ...
 - [ ] added entry in `CHANGELOG.rst` within the relevant release section
 - [ ] updated or added relevant tests
 - [ ] updated relevant documentation
-- [ ] added relevant label(s)
-- [ ] ran regression tests, post a link to the Jenkins job below.
-      [How to run regression tests on a PR](https://github.com/spacetelescope/jwst/wiki/Running-Regression-Tests-Against-PR-Branches)
+- [ ] added relevant label(s)

CHANGELOG.rst

@@ -21,6 +21,8 @@ number of the code change for that issue.  These PRs can be viewed at:
 3.9.1 (unreleased)
 ==================
 
+- Updated path for regression test results on artifactory. [#1933]
+
 - Added new header keywords and match requirements for relative fitting. [#1860]
 
 

doc/source/mast_data_products/hap-parameters.rst

@@ -105,6 +105,8 @@ mosaic_fitgeom_list: dict (*default={"rshift": 10, "rscale": 10, "general": 6}*)
         * 4 = Valid but compromised solution with RMS >= 10 mas
 
         * 5 = Not valid solution
+
+        * -1 = Alignment failed altogether. 
 
 
 generate_source_catalogs (*primarily in align_utils.py*)

tests/acs/test_asn_regress.py

@@ -1,5 +1,6 @@
 import os
 
+import pytest
 from stsci.tools import teal
 import drizzlepac
 from drizzlepac import astrodrizzle
@@ -10,6 +11,7 @@
 
 class TestAsnRegress(BaseACS):
 
+    @pytest.mark.skip(reason="stsci.tools.asnutils failing to load asn only using github actions.")
     def test_hrc_asn(self):
         # Customized tolerances as Linux and Mac would need different truth files.
         self.rtol = 1e-4
@@ -41,7 +43,7 @@ def test_hrc_asn(self):
         parObj['STEP 7: DRIZZLE FINAL COMBINED IMAGE']['final_bits'] = 8578
         parObj['STEP 7: DRIZZLE FINAL COMBINED IMAGE']['final_units'] = 'counts'
 
-        astrodrizzle.AstroDrizzle(asn_file, configobj=parObj)
+        astrodrizzle.AstroDrizzle(asn_file, configobj=parObj)       
 
         # Compare results
         outputs = [('j8bt06011_drz.fits', 'reference_asn_regress.fits')]

tests/hap/test_align.py

@@ -168,13 +168,13 @@ def test_align_47tuc(self):
                 "jbqf02i3q_flc.fits",
                 "jbqf02i8q_flc.fits",
                 "jbqf02iaq_flc.fits",
-            ],
-            [
-                "ib2u12kaq_flt.fits",
-                "ib2u12keq_flt.fits",
-                "ib2u12kiq_flt.fits",
-                "ib2u12klq_flt.fits",
-            ],
+            ], # commented out until alignment parameters better optimized. 
+            # [
+            #     "ib2u12kaq_flt.fits",
+            #     "ib2u12keq_flt.fits",
+            #     "ib2u12kiq_flt.fits",
+            #     "ib2u12klq_flt.fits",
+            # ],
             [
                 "ibnh02coq_flc.fits",
                 "ibnh02cmq_flc.fits",

tests/resources.py

@@ -21,6 +21,9 @@
 from ci_watson.hst_helpers import download_crds, ref_from_image
 
 
+TODAYS_DATE = datetime.datetime.now().strftime("%Y-%m-%d")
+
+
 # Base classes for actual tests.
 # NOTE: Named in a way so pytest will not pick them up here.
 @pytest.mark.bigdata
@@ -146,15 +149,14 @@ def compare_outputs(self, outputs, raise_error=True):
         testpath, testname = os.path.split(os.path.abspath(os.curdir))
         # organize results by day test was run...could replace with git-hash
         whoami = getpass.getuser() or 'nobody'
-        dt = datetime.datetime.now().strftime("%d%b%YT")
-        ttime = datetime.datetime.now().strftime("%H_%M_%S")
-        user_tag = 'NOT_CI_{}_{}'.format(whoami, ttime)
-        build_tag = os.environ.get('BUILD_TAG',  user_tag)
-        build_suffix = os.environ.get('BUILD_MATRIX_SUFFIX', 'standalone')
-        testdir = "{}_{}_{}".format(testname, build_tag, build_suffix)
-        tree = os.path.join(self.results_root, self.input_loc,
-                            dt, testdir) + os.sep
-
+        user_tag = 'NOT_CI_{}'.format(whoami)
+        build_tag = os.environ.get('BUILD_TAG', user_tag)
+        build_matrix_suffix = os.environ.get('BUILD_MATRIX_SUFFIX', '0')
+        subdir = '{}_{}_{}'.format(TODAYS_DATE, build_tag, build_matrix_suffix)
+
+        # subdir exmaple: # example: 2025-01-16_GITHUB_CI_Linux-X64-py3.11-783
+        # full path: drizzlepac_results/*subdir*/acs/test_tweak0/filename.fits
+        tree = os.path.join(self.results_root, subdir, self.input_loc, testname) + os.sep
         updated_outputs = []
         for actual, desired in outputs:
             # Get "truth" image