From 30a561ee052e85079af2fcd63178d0969716213c Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Mon, 16 Dec 2024 10:28:52 -0700 Subject: [PATCH 01/12] Add docs for planned tools new file: doc/deveny_ql.rst modified: doc/index.rst new file: doc/lmi_ql.rst --- doc/deveny_ql.rst | 25 +++++++++++++++++++++++++ doc/index.rst | 2 ++ doc/lmi_ql.rst | 27 +++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 doc/deveny_ql.rst create mode 100644 doc/lmi_ql.rst diff --git a/doc/deveny_ql.rst b/doc/deveny_ql.rst new file mode 100644 index 0000000..f517ece --- /dev/null +++ b/doc/deveny_ql.rst @@ -0,0 +1,25 @@ +.. include:: include/links.rst + +.. |nbsp| unicode:: 0xA0 + :trim: + +.. _deveny_ql: + +=============================== +DeVeny Spectrum Quick Look Tool +=============================== + +Status: *Planned* + +Overview +======== + + - ``deveny_ql``: A quick-look tool is needed for DeVeny spectra that can + show recently acquired spectra with rudimentary processing. This tool + will be based on other PypeIt QL tools. + + +Usage +===== + +Usage information will be added here once this tool enters development. diff --git a/doc/index.rst b/doc/index.rst index d45dca8..99a3488 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -22,6 +22,7 @@ Dependencies Table :hidden: Exposure Time Calculator + LMI Quick Look Tool .. toctree:: :caption: DeVeny Tools @@ -32,6 +33,7 @@ Dependencies Table Collimator Focus Sequence Estimator Collimator Focus Calculator Pickup Noise Scrubber + DeVeny Spectrum Quick Look Tool .. toctree:: :caption: General LDT Tools diff --git a/doc/lmi_ql.rst b/doc/lmi_ql.rst new file mode 100644 index 0000000..24e1d61 --- /dev/null +++ b/doc/lmi_ql.rst @@ -0,0 +1,27 @@ +.. include:: include/links.rst + +.. |nbsp| unicode:: 0xA0 + :trim: + +.. _lmi_ql: + +========================= +LMI Image Quick Look Tool +========================= + +Status: *Planned* + +Overview +======== + + - ``lmi_ql``: A quick-look tool is needed for LMI images that can show + recently acquired images with a simple bias-subtraction and flat-division. + This tool will likely be based on [Ginga]( + https://ginga.readthedocs.io/en/stable/) and development can be guided by + following some of the image-viewer steps included in PypeIt. + + +Usage +===== + +Usage information will be added here once this tool enters development. From ce3e33e3f3d95fbb0dd362198b643f4e919aafa9 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Wed, 8 Jan 2025 16:09:34 -0700 Subject: [PATCH 02/12] Add CI testing to `develop` branch modified: .github/workflows/ci_tests.yml --- .github/workflows/ci_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index be6548c..7841339 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -2,9 +2,9 @@ name: CI Tests on: push: - branches: - - main - pull_request: null + branches: [ main, develop ] + pull_request: + branches: [ main, develop ] env: SETUP_XVFB: true jobs: From 92816f92968952451565cb0dbc43d27f989f46f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 06:54:57 +0000 Subject: [PATCH 03/12] Bump stefanzweifel/git-auto-commit-action Bumps the actions group in /.github/workflows with 1 update: [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action). Updates `stefanzweifel/git-auto-commit-action` from 5.0.1 to 5.1.0 - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/8621497c8c39c72f3e2a999a26b4ca1b5058a842...e348103e9026cc0eee72ae06630dbe30c8bf7a79) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/update-changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 60960fd..940eadc 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -26,7 +26,7 @@ jobs: path-to-changelog: CHANGES.md - name: Commit updated CHANGELOG - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1 + uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0 with: branch: main commit_message: Update CHANGELOG From 71d371a8c672d0ee6adc0f1861e585805b3a7e65 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Mon, 24 Mar 2025 10:52:36 -0700 Subject: [PATCH 04/12] Updates to GitHub Actions modified: .github/workflows/ci_tests.yml modified: .github/workflows/documentation.yml new file: obstools/tests/files/.gitkeep modified: setup.cfg --- .github/workflows/ci_tests.yml | 24 ++++++++++++++++++++---- .github/workflows/documentation.yml | 7 ++----- obstools/tests/files/.gitkeep | 0 setup.cfg | 2 +- 4 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 obstools/tests/files/.gitkeep diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 7841339..0d92e48 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -1,12 +1,24 @@ --- name: CI Tests + on: - push: - branches: [ main, develop ] + workflow_dispatch: pull_request: - branches: [ main, develop ] + push: + branches: + - main + schedule: + # run every Monday at 6am UTC + - cron: '0 6 * * 1' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: - SETUP_XVFB: true + SETUP_XVFB: True # avoid issues if mpl tries to open a GUI window + TOXARGS: '-v' + jobs: ci-tests: name: Tox env ${{ matrix.python }}-${{ matrix.toxenv }} @@ -33,6 +45,10 @@ jobs: - name: Test with tox run: | tox -e ${{ matrix.python }}-${{ matrix.toxenv }} + - name: Upload coverage to codecov + - name: Upload coverage to codecov + if: "endsWith(matrix.tox_env, '-cov')" + uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0 os-tests: name: Python ${{ matrix.python }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index e46d0e6..09a3b0b 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -1,10 +1,7 @@ name: Docs on: - push: null - pull_request: - types: - - opened - workflow_dispatch: null + push: + workflow_dispatch: permissions: contents: write diff --git a/obstools/tests/files/.gitkeep b/obstools/tests/files/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/setup.cfg b/setup.cfg index 8fdd54c..98f07c1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,7 +39,7 @@ install_requires = darkdetect ccdproc matplotlib - numpy>=1.24,<2.0.0 + numpy>=1.26,<2.0.0 scipy>=1.9 PySimpleGUI-4-foss requests From 93b8e28d664213fc3ebe2baedd1da8fbe719c219 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Mon, 24 Mar 2025 11:06:07 -0700 Subject: [PATCH 05/12] Re-fix modified: .github/workflows/ci_tests.yml --- .github/workflows/ci_tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 0d92e48..aadef84 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -3,10 +3,9 @@ name: CI Tests on: workflow_dispatch: - pull_request: push: - branches: - - main + pull_request: + branches: [ main, develop ] schedule: # run every Monday at 6am UTC - cron: '0 6 * * 1' From ca8b0ddf54eb1c32f24eb1f550819dc7dc47c1d7 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Wed, 23 Apr 2025 10:44:35 -0700 Subject: [PATCH 06/12] Fix CI test modified: .github/workflows/ci_tests.yml --- .github/workflows/ci_tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index f69919d..cd337d7 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -47,7 +47,6 @@ jobs: - name: Test with tox run: | tox -e ${{ matrix.python }}-${{ matrix.toxenv }} - - name: Upload coverage to codecov - name: Upload coverage to codecov if: "endsWith(matrix.tox_env, '-cov')" uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0 From c020e8380e16a2db907c30ddd23aee2fa1fcf880 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Tue, 29 Apr 2025 12:52:32 -0700 Subject: [PATCH 07/12] Update testing and deps modified: setup.cfg modified: tox.ini --- setup.cfg | 9 +++++---- tox.ini | 16 ++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/setup.cfg b/setup.cfg index 98f07c1..ca688ab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,6 +20,7 @@ classifiers = Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 Topic :: Documentation :: Sphinx Topic :: Scientific/Engineering :: Astronomy Topic :: Software Development :: Libraries :: Python Modules @@ -29,18 +30,18 @@ classifiers = zip_safe = False use_2to3=False packages = find: -python_requires = >=3.10,<3.13 +python_requires = >=3.10,<3.14 setup_requires = setuptools_scm include_package_data = True install_requires = setuptools setuptools_scm - astropy>=5.1 + astropy>=6.0 darkdetect ccdproc matplotlib - numpy>=1.26,<2.0.0 - scipy>=1.9 + numpy>=2.0 + scipy PySimpleGUI-4-foss requests tqdm diff --git a/tox.ini b/tox.ini index 051002f..52acbce 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,7 @@ [tox] envlist = - {3.10,3.11,3.12}-test{,-alldeps} - {3.10,3.11,3.12}-test-numpy{124,125,126,200,201} - {3.10,3.11,3.12}-test-{numpy,astropy}dev + {3.10,3.11,3.12,3.13}-test{,-alldeps}{,-cov} + {3.10,3.11,3.12,3.13}-test-{numpy,astropy}dev codestyle requires = setuptools >= 65.0 @@ -36,22 +35,11 @@ description = devdeps: with the latest developer version of key dependencies oldestdeps: with the oldest supported version of key dependencies cov: and test coverage - numpy124: with numpy 1.24.* - numpy125: with numpy 1.25.* - numpy126: with numpy 1.26.* - numpy200: with numpy 2.0.* - numpy201: with numpy 2.1.* # The following provides some specific pinnings for key packages deps = cov: coverage - numpy124: numpy==1.24.* - numpy125: numpy==1.25.* - numpy126: numpy==1.26.* - numpy200: numpy==2.0.* - numpy201: numpy==2.1.* - numpydev: numpy>=0.0.dev0 astropydev: git+https://github.com/astropy/astropy.git#egg=astropy From fa0ad92800e9a52ccf904b74362d4a15e57464e1 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Tue, 13 May 2025 11:49:02 -0700 Subject: [PATCH 08/12] Clean up version printing; limit Python version Move obstools version printing from --version option in the scripts to an epilog in the printed help message. Also, because of the deprecation of classmethod properties (introduced in Python 3.9, deprecated in 3.11, and removed in 3.13), reduce maximum Python version to 3.12 until I can figure out what to do about it. modified: obstools/utils.py modified: setup.cfg --- obstools/utils.py | 20 +++++++------------- setup.cfg | 4 ++-- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/obstools/utils.py b/obstools/utils.py index 7e4d461..03b9e4b 100644 --- a/obstools/utils.py +++ b/obstools/utils.py @@ -531,10 +531,7 @@ def entry_point(cls): Defines the main script entry point. """ args = cls.parse_args() - if args.version: - print(f" LDT Observer Tools (obstools) version {__version__}") - else: - sys.exit(cls.main(args)) + sys.exit(cls.main(args)) @classmethod @property @@ -552,14 +549,10 @@ def parse_args(cls, options=None): """ parser = cls.get_parser() ScriptBase._fill_parser_cwd(parser) - # Add "--version" to bottom of all scripts - parser.add_argument( - "--version", action="store_true", help="Print version and exit" - ) - return parser.parse_args() if options is None else parser.parse_args(options) + return parser.parse_args(options) @staticmethod - def _fill_parser_cwd(parser): + def _fill_parser_cwd(parser: argparse.ArgumentParser): """ Replace the default of any action that is exactly ``'current working directory'`` with the value of ``os.getcwd()``. @@ -584,9 +577,9 @@ def main(args): @classmethod def get_parser( cls, - description=None, - width=None, - formatter=argparse.ArgumentDefaultsHelpFormatter, + description: str = None, + width: int = None, + formatter: argparse.HelpFormatter = argparse.ArgumentDefaultsHelpFormatter, ): """ Construct the command-line argument parser. @@ -624,6 +617,7 @@ def get_parser( return argparse.ArgumentParser( description=description, formatter_class=lambda prog: formatter(prog, width=width), + epilog=f"LDT Observer Tools (obstools) version {__version__}", ) diff --git a/setup.cfg b/setup.cfg index ca688ab..63ccaec 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,7 @@ classifiers = Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 - Programming Language :: Python :: 3.13 +# Programming Language :: Python :: 3.13 Topic :: Documentation :: Sphinx Topic :: Scientific/Engineering :: Astronomy Topic :: Software Development :: Libraries :: Python Modules @@ -30,7 +30,7 @@ classifiers = zip_safe = False use_2to3=False packages = find: -python_requires = >=3.10,<3.14 +python_requires = >=3.10,<3.13 setup_requires = setuptools_scm include_package_data = True install_requires = From 79e55a55c1d306041472ee2c68e063de8e693c15 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Tue, 13 May 2025 11:53:41 -0700 Subject: [PATCH 09/12] Main branch should have NumPy < 2 The updgrade to Numpy 2.0 will come with the `dofucs_work` branch. modified: setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 63ccaec..4d0ed0a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -40,7 +40,7 @@ install_requires = darkdetect ccdproc matplotlib - numpy>=2.0 + numpy>=1.24,<2.0 scipy PySimpleGUI-4-foss requests From 509d406e1f6728d9eaff43d9a5716874424cfcc8 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Tue, 13 May 2025 11:57:06 -0700 Subject: [PATCH 10/12] Decrease load on CI modified: .github/workflows/ci_tests.yml --- .github/workflows/ci_tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index cd337d7..e31954b 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -3,7 +3,6 @@ name: CI Tests on: workflow_dispatch: - push: pull_request: branches: [ main, develop ] schedule: From 7ec64ad8764f9297f53342da5adb57727072e563 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Tue, 13 May 2025 12:02:07 -0700 Subject: [PATCH 11/12] Update docs modified: doc/help/deveny_collfocus.rst modified: doc/help/deveny_grangle.rst modified: doc/help/dfocus.rst modified: doc/help/fix_ldt_header.rst modified: doc/help/lmi_etc.rst modified: doc/help/neocp_ephem.rst modified: doc/help/scrub_deveny_pickup.rst modified: doc/include/dependencies_table.rst --- doc/help/deveny_collfocus.rst | 2 ++ doc/help/deveny_grangle.rst | 2 ++ doc/help/dfocus.rst | 2 ++ doc/help/fix_ldt_header.rst | 2 ++ doc/help/lmi_etc.rst | 2 ++ doc/help/neocp_ephem.rst | 2 ++ doc/help/scrub_deveny_pickup.rst | 2 ++ doc/include/dependencies_table.rst | 2 +- 8 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/help/deveny_collfocus.rst b/doc/help/deveny_collfocus.rst index 494c811..bfe5bd2 100644 --- a/doc/help/deveny_collfocus.rst +++ b/doc/help/deveny_collfocus.rst @@ -7,4 +7,6 @@ options: -h, --help show this help message and exit + + LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 \ No newline at end of file diff --git a/doc/help/deveny_grangle.rst b/doc/help/deveny_grangle.rst index a8ff66a..0ee91dd 100644 --- a/doc/help/deveny_grangle.rst +++ b/doc/help/deveny_grangle.rst @@ -10,4 +10,6 @@ --cli Use the command-line version of this tool (default: False) --max Use the MAX version of the GUI (compute wavelength from angle) (default: False) + + LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 \ No newline at end of file diff --git a/doc/help/dfocus.rst b/doc/help/dfocus.rst index 0b22686..df5e896 100644 --- a/doc/help/dfocus.rst +++ b/doc/help/dfocus.rst @@ -10,4 +10,6 @@ --flog FLOG focus log to use (default: last) --thresh THRESH threshold for line detection (default: 100.0) --nodisplay DO NOT launch Preview.app to display plots (default: False) + + LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 \ No newline at end of file diff --git a/doc/help/fix_ldt_header.rst b/doc/help/fix_ldt_header.rst index c79ff78..699754d 100644 --- a/doc/help/fix_ldt_header.rst +++ b/doc/help/fix_ldt_header.rst @@ -12,4 +12,6 @@ options: -h, --help show this help message and exit + + LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 \ No newline at end of file diff --git a/doc/help/lmi_etc.rst b/doc/help/lmi_etc.rst index 47b55f2..c44fa71 100644 --- a/doc/help/lmi_etc.rst +++ b/doc/help/lmi_etc.rst @@ -7,4 +7,6 @@ options: -h, --help show this help message and exit + + LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 \ No newline at end of file diff --git a/doc/help/neocp_ephem.rst b/doc/help/neocp_ephem.rst index 552223b..7d41b81 100644 --- a/doc/help/neocp_ephem.rst +++ b/doc/help/neocp_ephem.rst @@ -10,4 +10,6 @@ options: -h, --help show this help message and exit + + LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 \ No newline at end of file diff --git a/doc/help/scrub_deveny_pickup.rst b/doc/help/scrub_deveny_pickup.rst index 054a64f..c068639 100644 --- a/doc/help/scrub_deveny_pickup.rst +++ b/doc/help/scrub_deveny_pickup.rst @@ -22,4 +22,6 @@ -d, --diagnostics Output additional information and plots during the analysis for debugging purposes (default: False) -n, --no_refit Force no refit of 'bad' RMS values (default: False) + + LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 \ No newline at end of file diff --git a/doc/include/dependencies_table.rst b/doc/include/dependencies_table.rst index 86cd76b..2dec0a4 100644 --- a/doc/include/dependencies_table.rst +++ b/doc/include/dependencies_table.rst @@ -1,6 +1,6 @@ ================================ ================================================================================================================================================================================================================================= Python Version ``>=3.10,<3.13`` -Required for users ``PySimpleGUI-4-foss``, ``astropy>=5.1``, ``ccdproc``, ``darkdetect``, ``matplotlib``, ``numpy>=1.24,<2.0.0``, ``requests``, ``scipy>=1.9``, ``setuptools``, ``setuptools_scm``, ``tqdm`` +Required for users ``PySimpleGUI-4-foss``, ``astropy>=6.0``, ``ccdproc``, ``darkdetect``, ``matplotlib``, ``numpy>=1.24,<2.0``, ``requests``, ``scipy``, ``setuptools``, ``setuptools_scm``, ``tqdm`` Optional ``pypeit`` requirements ``pypeit[specutils]>=1.15.0`` Required for developers ``black``, ``pylint``, ``pypeit[specutils]>=1.15.0``, ``pytest-astropy``, ``pytest>=7.0.0``, ``pyyaml``, ``sphinx-automodapi``, ``sphinx-subfigure``, ``sphinx>=1.6``, ``sphinx_rtd_theme``, ``stomp.py``, ``tox``, ``xmltodict`` ================================ ================================================================================================================================================================================================================================= From 2230d0026e3841d4af62fd4bb48cf6f86d266a56 Mon Sep 17 00:00:00 2001 From: "Timothy P. Ellsworth Bowers" Date: Tue, 13 May 2025 12:24:55 -0700 Subject: [PATCH 12/12] Tag version modified: doc/help/deveny_collfocus.rst modified: doc/help/deveny_grangle.rst modified: doc/help/dfocus.rst modified: doc/help/fix_ldt_header.rst modified: doc/help/lmi_etc.rst modified: doc/help/neocp_ephem.rst modified: doc/help/scrub_deveny_pickup.rst modified: doc/scripts/write_script_help.py --- doc/help/deveny_collfocus.rst | 2 +- doc/help/deveny_grangle.rst | 2 +- doc/help/dfocus.rst | 2 +- doc/help/fix_ldt_header.rst | 2 +- doc/help/lmi_etc.rst | 2 +- doc/help/neocp_ephem.rst | 2 +- doc/help/scrub_deveny_pickup.rst | 2 +- doc/scripts/write_script_help.py | 2 ++ 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/help/deveny_collfocus.rst b/doc/help/deveny_collfocus.rst index bfe5bd2..991c076 100644 --- a/doc/help/deveny_collfocus.rst +++ b/doc/help/deveny_collfocus.rst @@ -8,5 +8,5 @@ options: -h, --help show this help message and exit - LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 + LDT Observer Tools (obstools) version 0.6.7 \ No newline at end of file diff --git a/doc/help/deveny_grangle.rst b/doc/help/deveny_grangle.rst index 0ee91dd..1793cd4 100644 --- a/doc/help/deveny_grangle.rst +++ b/doc/help/deveny_grangle.rst @@ -11,5 +11,5 @@ --max Use the MAX version of the GUI (compute wavelength from angle) (default: False) - LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 + LDT Observer Tools (obstools) version 0.6.7 \ No newline at end of file diff --git a/doc/help/dfocus.rst b/doc/help/dfocus.rst index df5e896..e27dc07 100644 --- a/doc/help/dfocus.rst +++ b/doc/help/dfocus.rst @@ -11,5 +11,5 @@ --thresh THRESH threshold for line detection (default: 100.0) --nodisplay DO NOT launch Preview.app to display plots (default: False) - LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 + LDT Observer Tools (obstools) version 0.6.7 \ No newline at end of file diff --git a/doc/help/fix_ldt_header.rst b/doc/help/fix_ldt_header.rst index 699754d..e2deefa 100644 --- a/doc/help/fix_ldt_header.rst +++ b/doc/help/fix_ldt_header.rst @@ -13,5 +13,5 @@ options: -h, --help show this help message and exit - LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 + LDT Observer Tools (obstools) version 0.6.7 \ No newline at end of file diff --git a/doc/help/lmi_etc.rst b/doc/help/lmi_etc.rst index c44fa71..14a65e6 100644 --- a/doc/help/lmi_etc.rst +++ b/doc/help/lmi_etc.rst @@ -8,5 +8,5 @@ options: -h, --help show this help message and exit - LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 + LDT Observer Tools (obstools) version 0.6.7 \ No newline at end of file diff --git a/doc/help/neocp_ephem.rst b/doc/help/neocp_ephem.rst index 7d41b81..a8988b6 100644 --- a/doc/help/neocp_ephem.rst +++ b/doc/help/neocp_ephem.rst @@ -11,5 +11,5 @@ options: -h, --help show this help message and exit - LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 + LDT Observer Tools (obstools) version 0.6.7 \ No newline at end of file diff --git a/doc/help/scrub_deveny_pickup.rst b/doc/help/scrub_deveny_pickup.rst index c068639..fe483d7 100644 --- a/doc/help/scrub_deveny_pickup.rst +++ b/doc/help/scrub_deveny_pickup.rst @@ -23,5 +23,5 @@ analysis for debugging purposes (default: False) -n, --no_refit Force no refit of 'bad' RMS values (default: False) - LDT Observer Tools (obstools) version 0.6.7.dev28+g37e274b.d20250513 + LDT Observer Tools (obstools) version 0.6.7 \ No newline at end of file diff --git a/doc/scripts/write_script_help.py b/doc/scripts/write_script_help.py index 0c067fb..b8746a0 100644 --- a/doc/scripts/write_script_help.py +++ b/doc/scripts/write_script_help.py @@ -42,6 +42,8 @@ def write_help(script_cls: utils.ScriptBase, opath: pathlib.Path, width: int = 8 parser = script_cls.get_parser(width=width) parser.prog = exe lines += [" " + l for l in parser.format_help().split("\n")] + # Remove ".dev....." junk from the version + lines[-2] = lines[-2].split('.dev')[0] print(f"Writing: {ofile}") with open(ofile, "w", encoding="utf-8") as f_obj: f_obj.write("\n".join(lines))