lsst-ts · iglesu · Dec 17, 2024 · Dec 17, 2024
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,7 @@
 @Library('JenkinsShared')_
 DevelopPipeline(
-    name: "ts_standardscripts",
-    module_name: "lsst.ts.standardscripts",
-    extra_packages: ["lsst-ts/ts_cRIOpy", "lsst-ts/ts_observatory_control"],
+    name: "ts_auxtel_standardscripts",
+    module_name: "lsst.ts.auxtel.standardscripts",
+    extra_packages: ["lsst-ts/ts_cRIOpy", "lsst-ts/ts_observatory_control", "lsst-ts/ts_standardscripts"],
     build_all_idl: true
 )
diff --git a/Jenkinsfile.conda b/Jenkinsfile.conda
@@ -1,2 +1,2 @@
 @Library('JenkinsShared')_
-CondaPipeline(["ts_config_ocs","ts_config_attcs"], "ts-standardscripts", "lsst.ts.standardscripts", "noarch")
+CondaPipeline(["ts_config_ocs","ts_config_attcs"], "ts-auxtel-standardscripts", "lsst.ts.auxtel.standardscripts", "noarch")
diff --git a/README.rst b/README.rst
@@ -1,11 +1,11 @@
 ##################
-ts_standardscripts
+ts_auxtel_standardscripts
 ##################
 
-Standard SAL scripts for operating the LSST via the `lsst.ts.scriptqueue.ScriptQueue`.
+Auxiliary Telescope Standard SAL scripts for operating the LSST via the `lsst.ts.scriptqueue.ScriptQueue`.
 Each script is a subclass of `lsst.ts.scriptqueue.ScriptBase`.
 
-`Documentation <https://ts-standardscripts.lsst.io>`_
+`Documentation <https://ts-auxtel-standardscripts.lsst.io>`_
 
 This code uses ``pre-commit`` to maintain ``black`` formatting and ``flake8`` compliance.
 To enable this:

diff --git a/SConstruct b/SConstruct
@@ -2,4 +2,4 @@
 from lsst.sconsUtils import scripts
 
 # Python-only package
-scripts.BasicSConstruct("ts_standardscripts", disableCc=True, noCfgFile=True)
+scripts.BasicSConstruct("ts_auxtel_standardscripts", disableCc=True, noCfgFile=True)
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,6 +1,6 @@
 {% set data= load_setup_py_data() %}
 package:
-  name: ts-standardscripts
+  name: ts-auxtel-standardscripts
   version: {{ data.get('version') }}
 
 source:
@@ -18,13 +18,14 @@ test:
     - ts-idl {{ idl_version }}
     - ts-salobj {{ salobj_version }}
     - ts-observatory-control
+    - ts-standardscripts
   source_files:
     - python
     - tests
     - setup.cfg
     - pyproject.toml
   imports:
-    - lsst.ts.standardscripts
+    - lsst.ts.auxtel.standardscripts
 
 requirements:
   host:
@@ -40,6 +41,7 @@ requirements:
     - astroquery
     - astroplan
     - ts-observatory-control
+    - ts-standardscripts
   run:
     - python {{ python }}
     - setuptools
@@ -49,3 +51,4 @@ requirements:
     - astroquery
     - astroplan
     - ts-observatory-control
+    - ts-standardscripts
diff --git a/doc/conf.py b/doc/conf.py
@@ -2,15 +2,16 @@
 This configuration only affects single-package Sphinx documentation builds.
 """
 
-import lsst.ts.standardscripts  # noqa
+import lsst.ts.auxtel.standardscripts  # noqa
 from documenteer.conf.pipelinespkg import *  # type: ignore # noqa
 
-project = "ts_standardscripts"
+project = "ts_auxtel_standardscripts"
 html_theme_options["logotext"] = project  # type: ignore # noqa
 html_title = project
 html_short_title = project
 doxylink = {}  # Avoid warning: Could not find tag file _doxygen/doxygen.tag
 
+intersphinx_mapping["ts_standardscripts"] = ("https://ts-standardscripts.lsst.io", None)  # type: ignore # noqa
 intersphinx_mapping["ts_observatory_control"] = (  # type: ignore # noqa
     "https://ts-observatory-control.lsst.io",
     None,

diff --git a/doc/developer_guide.rst b/doc/developer_guide.rst
@@ -1,25 +1,25 @@
-.. py:currentmodule:: lsst.ts.standardscripts
+.. py:currentmodule:: lsst.ts.auxtel.standardscripts
 
-.. _lsst.ts.standardscripts.developer_guide:
+.. _lsst.ts.auxtel.standardscripts.developer_guide:
 
 ###############
 Developer Guide
 ###############
 
-.. image:: https://img.shields.io/badge/GitHub-ts_standardscripts-green.svg
-    :target: https://github.com/lsst-ts/ts_standardscripts
-.. image:: https://img.shields.io/badge/Jenkins-ts_standardscripts-green.svg
-    :target: https://tssw-ci.lsst.org/job/LSST_Telescope-and-Site/job/ts_standardscripts/
-.. image:: https://img.shields.io/badge/Jira-ts_standardscripts-green.svg
-    :target: https://jira.lsstcorp.org/issues/?jql=project%3DDM%20AND%20labels%3Dts_standardscripts
+.. image:: https://img.shields.io/badge/GitHub-ts_auxtel_standardscripts-green.svg
+    :target: https://github.com/lsst-ts/ts_auxtel_standardscripts
+.. image:: https://img.shields.io/badge/Jenkins-ts_auxtel_standardscripts-green.svg
+    :target: https://tssw-ci.lsst.org/job/LSST_Telescope-and-Site/job/ts_auxtel_standardscripts/
+.. image:: https://img.shields.io/badge/Jira-ts_auxtel_standardscripts-green.svg
+    :target: https://jira.lsstcorp.org/issues/?jql=project%3DDM%20AND%20labels%3Dts_auxtel_standardscripts
 
 .. _contributing:
 
-Contributing
+Contributing:
 ============
 
-``lsst.ts.standardscripts`` is developed at https://github.com/lsst-ts/ts_standardscripts.
-You can find Jira issues for this package using `project=DM and labels=ts_standardscripts <https://jira.lsstcorp.org/issues/?jql=project%3DDM%20AND%20labels%3Dts_standardscripts>`_.
+``lsst.ts.auxtel_standardscripts`` is developed at https://github.com/lsst-ts/ts_auxtel_standardscripts.
+You can find Jira issues for this package using `project=DM and labels=ts_auxtel_standardscripts <https://jira.lsstcorp.org/issues/?jql=project%3DDM%20AND%20labels%3Dts_auxtel_standardscripts>`_.
 
 .. _api_ref:
 
@@ -29,8 +29,8 @@ Python API reference
 .. automodapi:: lsst.ts.standardscripts
    :no-main-docstr:
 
-.. automodapi:: lsst.ts.standardscripts.auxtel
+.. automodapi:: lsst.ts.auxtel.standardscripts
    :no-main-docstr:
 
-.. automodapi:: lsst.ts.standardscripts.maintel
+.. automodapi:: lsst.ts.auxtel.standardscripts
    :no-main-docstr:
diff --git a/doc/index.rst b/doc/index.rst
@@ -1,17 +1,17 @@
-.. py:currentmodule:: lsst.ts.standardscripts
+.. py:currentmodule:: lsst.ts.auxtel.standardscripts
 
-.. _standardscripts:
+.. _auxtel_standardscripts:
 
 ################
 Standard Scripts
 ################
 
-.. image:: https://img.shields.io/badge/GitHub-ts_standardscripts-green.svg
-    :target: https://github.com/lsst-ts/ts_standardscripts
-.. image:: https://img.shields.io/badge/Jenkins-ts_standardscripts-green.svg
-    :target: https://tssw-ci.lsst.org/job/LSST_Telescope-and-Site/job/ts_standardscripts/
-.. image:: https://img.shields.io/badge/Jira-ts_standardscripts-green.svg
-    :target: https://jira.lsstcorp.org/issues/?jql=project%3DDM%20AND%20labels%3Dts_standardscripts
+.. image:: https://img.shields.io/badge/GitHub-ts_auxtel_standardscripts-green.svg
+    :target: https://github.com/lsst-ts/ts_auxtel_standardscripts
+.. image:: https://img.shields.io/badge/Jenkins-ts_auxtel_standardscripts-green.svg
+    :target: https://tssw-ci.lsst.org/job/LSST_Telescope-and-Site/job/ts_auxtel_standardscripts/
+.. image:: https://img.shields.io/badge/Jira-ts_auxtel_standardscripts-green.svg
+    :target: https://jira.lsstcorp.org/issues/?jql=project%3DDM%20AND%20labels%3Dts_auxtel_standardscripts
 
 Overview
 ========
@@ -24,9 +24,9 @@ User Documentation
 To add a script to this package:
 
 * Read `SAL Scripts <https://ts-salobj.lsst.io/sal_scripts.html>`_ to learn the basics of writing a SAL script.
-* Add your script implementation to the library: ``python/lsst/ts/standardscripts``.
+* Add your script implementation to the library: ``python/lsst/ts/auxtel/standardscripts``.
 * Add a test suite to the ``tests`` directory.
-* Add a bin script to the ``python/lsst/ts/standardscripts/data/scripts`` directory.
+* Add a bin script to the ``python/lsst/ts/auxtel/standardscripts/data/scripts`` directory.
 
 Developer Documentation
 =======================

diff --git a/doc/manifest.yaml b/doc/manifest.yaml
@@ -3,10 +3,10 @@
 # List of names of Python modules in this package.
 # For each module there is a corresponding module doc subdirectory.
 modules:
-  - "lsst.ts.standardscripts"
+  - "lsst.ts.auxtel.standardscripts"
 
 # Name of the static content directories (subdirectories of `_static`).
 # Static content directories are usually named after the package.
 # Most packages do not need a static content directory (leave commented out).
 # statics:
-#   - "_static/ts_standardscripts"
+#   - "_static/ts_auxtel_standardscripts"
diff --git a/doc/news/DM-48003.feature.rst b/doc/news/DM-48003.feature.rst
@@ -0,0 +1,2 @@
+Split `ts_auxtel_standardscripts` repo from `ts_standardscripts`
+to focus exclusively on auxiliary telescope logic.
diff --git a/doc/version_history.rst b/doc/version_history.rst
@@ -1,6 +1,6 @@
-.. py:currentmodule:: lsst.ts.standardscripts
+.. py:currentmodule:: lsst.ts.auxtel.standardscripts
 
-.. _lsst.ts.standardscripts.version_history:
+.. _lsst.ts.auxtel.standardscripts.version_history:
 
 ===============
 Version History

diff --git a/pyproject.toml b/pyproject.toml
@@ -3,11 +3,11 @@ requires = [ "setuptools", "setuptools_scm" ]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "ts_standardscripts"
-description = "Standard SAL scripts for LSST observing with the script queue."
+name = "ts_auxtel_standardscripts"
+description = "Auxiliary telescope specific standard SAL scripts for LSST observing with the script queue."
 license = { text = "GPL" }
 classifiers = [ "Programming Language :: Python :: 3" ]
-urls = { documentation = "https://ts-standardscripts.lsst.io", repository = "https://github.com/lsst-ts/ts_standardscripts" }
+urls = { documentation = "https://ts-auxtel-standardscripts.lsst.io", repository = "https://github.com/lsst-ts/ts_auxtel_standardscripts" }
 dynamic = [ "version" ]
 
 [tool.setuptools.dynamic]
@@ -17,7 +17,7 @@ version = { attr = "setuptools_scm.get_version" }
 where = [ "python" ]
 
 [tool.setuptools_scm]
-write_to = "python/lsst/ts/standardscripts/version.py"
+write_to = "python/lsst/ts/auxtel/standardscripts/version.py"
 write_to_template = """
 # Generated by setuptools_scm
 __all__ = ["__version__"]
@@ -35,7 +35,7 @@ src_paths = ["python", "test"]
 dev = ["documenteer[pipelines]"]
 
 [tool.towncrier]
-    package = "lsst.ts.standardscripts"
+    package = "lsst.ts.auxtel.standardscripts"
     package_dir = "python"
     filename = "doc/version_history.rst"
     directory = "doc/news"

diff --git a/...sst/ts/standardscripts/auxtel/__init__.py → ...sst/ts/auxtel/standardscripts/__init__.py b/...sst/ts/standardscripts/auxtel/__init__.py → ...sst/ts/auxtel/standardscripts/__init__.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project
@@ -42,3 +42,12 @@
 from .take_stuttered_latiss import *
 from .track_target import *
 from .track_target_and_take_image import *
+from .utils import *
+
+try:
+    from .version import *
+except ImportError:
+    __version__ = "?"
+    __repo_version__ = "?"
+    __fingerprint__ = "? *"
+    __dependency_versions__ = {}
diff --git a/...standardscripts/auxtel/atdome/__init__.py → ...auxtel/standardscripts/atdome/__init__.py b/...standardscripts/auxtel/atdome/__init__.py → ...auxtel/standardscripts/atdome/__init__.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...andardscripts/auxtel/atdome/close_dome.py → ...xtel/standardscripts/atdome/close_dome.py b/...andardscripts/auxtel/atdome/close_dome.py → ...xtel/standardscripts/atdome/close_dome.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...ripts/auxtel/atdome/close_dropout_door.py → ...ndardscripts/atdome/close_dropout_door.py b/...ripts/auxtel/atdome/close_dropout_door.py → ...ndardscripts/atdome/close_dropout_door.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...s/auxtel/atdome/disable_dome_following.py → ...dscripts/atdome/disable_dome_following.py b/...s/auxtel/atdome/disable_dome_following.py → ...dscripts/atdome/disable_dome_following.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...ts/auxtel/atdome/enable_dome_following.py → ...rdscripts/atdome/enable_dome_following.py b/...ts/auxtel/atdome/enable_dome_following.py → ...rdscripts/atdome/enable_dome_following.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...tandardscripts/auxtel/atdome/home_dome.py → ...uxtel/standardscripts/atdome/home_dome.py b/...tandardscripts/auxtel/atdome/home_dome.py → ...uxtel/standardscripts/atdome/home_dome.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...tandardscripts/auxtel/atdome/open_dome.py → ...uxtel/standardscripts/atdome/open_dome.py b/...tandardscripts/auxtel/atdome/open_dome.py → ...uxtel/standardscripts/atdome/open_dome.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...cripts/auxtel/atdome/open_dropout_door.py → ...andardscripts/atdome/open_dropout_door.py b/...cripts/auxtel/atdome/open_dropout_door.py → ...andardscripts/atdome/open_dropout_door.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...tandardscripts/auxtel/atdome/slew_dome.py → ...uxtel/standardscripts/atdome/slew_dome.py b/...tandardscripts/auxtel/atdome/slew_dome.py → ...uxtel/standardscripts/atdome/slew_dome.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...rdscripts/auxtel/calibrations/__init__.py → .../standardscripts/calibrations/__init__.py b/...rdscripts/auxtel/calibrations/__init__.py → .../standardscripts/calibrations/__init__.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/...auxtel/calibrations/power_off_atcalsys.py → ...cripts/calibrations/power_off_atcalsys.py b/...auxtel/calibrations/power_off_atcalsys.py → ...cripts/calibrations/power_off_atcalsys.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/.../auxtel/calibrations/power_on_atcalsys.py → ...scripts/calibrations/power_on_atcalsys.py b/.../auxtel/calibrations/power_on_atcalsys.py → ...scripts/calibrations/power_on_atcalsys.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/.../calibrations/run_calibration_sequence.py → .../calibrations/run_calibration_sequence.py b/.../calibrations/run_calibration_sequence.py → .../calibrations/run_calibration_sequence.py
@@ -32,8 +32,7 @@
 from lsst.ts.observatory.control.auxtel.atcalsys import ATCalsys
 from lsst.ts.observatory.control.auxtel.latiss import LATISS
 from lsst.ts.standardscripts import BaseBlockScript
-
-from ...utils import get_s3_bucket
+from lsst.ts.standardscripts.utils import get_s3_bucket
 
 
 class RunCalibrationSequence(BaseBlockScript):

diff --git a/...standardscripts/auxtel/calsys_takedata.py → ...auxtel/standardscripts/calsys_takedata.py b/...standardscripts/auxtel/calsys_takedata.py → ...auxtel/standardscripts/calsys_takedata.py
@@ -1,4 +1,4 @@
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project

diff --git a/python/lsst/ts/auxtel/standardscripts/data/scripts/README.md b/python/lsst/ts/auxtel/standardscripts/data/scripts/README.md
@@ -0,0 +1,7 @@
+LSST auxiliary telescope specific SAL scripts to operate the LSST.
+
+`Documentation <https://ts-auxtel-standardscripts.lsst.io>`_
+
+Scripts may be grouped by putting them in suitable subdirectories.
+Scripts must be command-line executables that take a single
+command-line argument: the SAL index for the script.
diff --git a/.../data/scripts/auxtel/atdome/close_dome.py → ...scripts/data/scripts/atdome/close_dome.py b/.../data/scripts/auxtel/atdome/close_dome.py → ...scripts/data/scripts/atdome/close_dome.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project
@@ -22,6 +22,6 @@
 
 import asyncio
 
-from lsst.ts.standardscripts.auxtel.atdome import CloseDome
+from lsst.ts.auxtel.standardscripts.atdome import CloseDome
 
 asyncio.run(CloseDome.amain())
diff --git a/...ripts/auxtel/atdome/close_dropout_door.py → ...data/scripts/atdome/close_dropout_door.py b/...ripts/auxtel/atdome/close_dropout_door.py → ...data/scripts/atdome/close_dropout_door.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project
@@ -22,6 +22,6 @@
 
 import asyncio
 
-from lsst.ts.standardscripts.auxtel.atdome import CloseDropoutDoor
+from lsst.ts.auxtel.standardscripts.atdome import CloseDropoutDoor
 
 asyncio.run(CloseDropoutDoor.amain())
diff --git a/...s/auxtel/atdome/disable_dome_following.py → .../scripts/atdome/disable_dome_following.py b/...s/auxtel/atdome/disable_dome_following.py → .../scripts/atdome/disable_dome_following.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# This file is part of ts_standardscripts
+# This file is part of ts_auxtel_standardscripts
 #
 # Developed for the LSST Telescope and Site Systems.
 # This product includes software developed by the LSST Project
@@ -22,6 +22,6 @@
 
 import asyncio
 
-from lsst.ts.standardscripts.auxtel.atdome import DisableDomeFollowing
+from lsst.ts.auxtel.standardscripts.atdome import DisableDomeFollowing
 
 asyncio.run(DisableDomeFollowing.amain())
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Split `ts_auxtel_standardscripts` repo from `ts_standardscripts`
		to focus exclusively on auxiliary telescope logic.