Merge pull request #358 from mfixstsci/release-0.24.0

Update pysiaf with PRDOPSSOC-068
spacetelescope · Nov 25, 2024 · 95628f9 · 95628f9
2 parents b386490 + 68f8c45
commit 95628f9
Show file tree

Hide file tree

Showing 13 changed files with 94,944 additions and 57 deletions.
diff --git a/pysiaf/__init__.py b/pysiaf/__init__.py
@@ -10,12 +10,7 @@
 # Configure logging
 logger = logging.getLogger(__name__)
 
-from pkg_resources import get_distribution, DistributionNotFound
-try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
-    # package is not installed
-    __version__ = 'unknown'
+from .version import __version__
 
 from .aperture import Aperture, HstAperture, JwstAperture, RomanAperture
 from .constants import JWST_PRD_VERSION, JWST_PRD_DATA_ROOT, JWST_PRD_DATA_ROOT_EXCEL, HST_PRD_VERSION, \

diff --git a/pysiaf/pre_delivery_data/FGS/FGS_SIAF.xlsx → ...PRDOPSSOC-068/SIAFXML/Excel/FGS_SIAF.xlsx b/pysiaf/pre_delivery_data/FGS/FGS_SIAF.xlsx → ...PRDOPSSOC-068/SIAFXML/Excel/FGS_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-068/SIAFXML/Excel/MIRI_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-068/SIAFXML/Excel/MIRI_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-068/SIAFXML/Excel/NIRCam_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-068/SIAFXML/Excel/NIRCam_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-068/SIAFXML/Excel/NIRISS_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-068/SIAFXML/Excel/NIRISS_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-068/SIAFXML/Excel/NIRSpec_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-068/SIAFXML/Excel/NIRSpec_SIAF.xlsx
diff --git a/pysiaf/pre_delivery_data/FGS/FGS_SIAF.xml → ...RDOPSSOC-068/SIAFXML/SIAFXML/FGS_SIAF.xml b/pysiaf/pre_delivery_data/FGS/FGS_SIAF.xml → ...RDOPSSOC-068/SIAFXML/SIAFXML/FGS_SIAF.xml
@@ -1,7 +1,7 @@
 <SiafEntries>
-  <!--Generated 2024-10-18T15:11:26.317 utc-->
-  <!--by tsohn-->
-  <!--pysiaf version 0.23.4.dev10+g39813ee.d20241018-->
+  <!--Generated 2024-10-21T15:02:22.478 utc-->
+  <!--by dlong-->
+  <!--pysiaf version 0.13.1.dev357+gb386490.d20241021-->
   <SiafEntry>
     <InstrName>FGS</InstrName>
     <AperName>FGS1_FULL_OSS</AperName>