From 6154040dedf940279953aafcfff7e9175f54e2ef Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Thu, 9 Nov 2023 14:47:23 -0500 Subject: [PATCH] pin Python in RTD environment (#1687) Co-authored-by: Steve Goldman <32876747+s-goldman@users.noreply.github.com> --- doc/.rtd-environment.yml | 23 +++++++++++------------ doc/source/reference/util.rst | 1 - drizzlepac/haputils/poller_utils.py | 15 +++++++++++++-- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/doc/.rtd-environment.yml b/doc/.rtd-environment.yml index a85684c17..feec004fe 100644 --- a/doc/.rtd-environment.yml +++ b/doc/.rtd-environment.yml @@ -2,23 +2,25 @@ name: rtd311 channels: - defaults dependencies: - - python - - setuptools + - astropy - numpy - numpydoc + - pip + - python=3.11 - scipy - - astropy - graphviz - pip: - - -e .. - - sphinx - - "sphinx_rtd_theme>1.2.0" - - sphinx_automodapi - - matplotlib - - "spherical_geometry>=1.2.22" + - astroquery - fitsblender + - lxml + - matplotlib - nictools + - photutils - pyregion + - "spherical_geometry>=1.2.22" + - sphinx + - "sphinx_rtd_theme>1.2.0" + - sphinx_automodapi - stwcs - stsci.tools - "stsci.image>=2.3.0" @@ -27,7 +29,4 @@ dependencies: - stsci.stimage - "tweakwcs>=0.8.0" - stregion - - astroquery - - photutils - - lxml - tables diff --git a/doc/source/reference/util.rst b/doc/source/reference/util.rst index 02433a34d..8914044a4 100644 --- a/doc/source/reference/util.rst +++ b/doc/source/reference/util.rst @@ -12,7 +12,6 @@ and interpretation of the ``MDRIZTAB`` reference file. .. toctree:: :maxdepth: 3 - utilfuncs wcsutils outimage mdztab diff --git a/drizzlepac/haputils/poller_utils.py b/drizzlepac/haputils/poller_utils.py index da7c75d90..0669bda00 100644 --- a/drizzlepac/haputils/poller_utils.py +++ b/drizzlepac/haputils/poller_utils.py @@ -116,6 +116,7 @@ # def interpret_obset_input(results: str, log_level): """ + parses the file generated by the pipeline poller, and produces a tree listing of the output products. Parameters ----------- @@ -141,22 +142,32 @@ def interpret_obset_input(results: str, log_level): Interpret the database query for a given obset to prepare the returned values for use in generating the names of all the expected output products. - Input will have formated rows of one of the following three options:: + Input will have formated rows of one of the following three options 1) Full poller file + + .. code-block:: + ib4606c5q_flc.fits,11665,B46,06,1.0,F555W,UVIS,/foo/bar/ib4606c5q_flc.fits 2) Simpler poller file (list); other info taken from file header keywords + + .. code-block:: + ib4606c5q_flc.fits 3) For updating the WFPC2 SVM aperture keyword using the poller file; it is important that there are no spaces within the poller aperture keyword(s) + .. code-block:: + ib4606c5q_flc.fits, PC1-FIX;F160BN15 Full poller files contain filename, proposal_id, program_id, obset_id, exptime, filters, detector, pathname. - The output dict will have format (as needed by further code for creating the product filenames) of:: + The output dict will have format (as needed by further code for creating the product filenames) of + + .. code-block:: obs_info_dict["single exposure product 00": {"info": '11665 06 wfc3 uvis empty_aperture ib4606c5q f555w drc', "files": ['ib4606c5q_flc.fits']}