Move instrument option/argument to pipe_base

lsst · Mar 21, 2022 · b15628d · b15628d
1 parent 0e99026
commit b15628d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/python/lsst/obs/base/cli/cmd/commands.py b/python/lsst/obs/base/cli/cmd/commands.py
@@ -33,9 +33,10 @@
     where_option,
 )
 from lsst.daf.butler.cli.utils import ButlerCommand, split_commas, typeStrAcceptsMultiple
+from lsst.pipe.base.cli.opt import instrument_argument
 
 from ... import script
-from ..opt import failfast_option, instrument_argument
+from ..opt import failfast_option
 
 # regular expression that can be used to find supported fits file extensions.
 fits_re = r"\.fit[s]?\b"

diff --git a/python/lsst/obs/base/cli/opt/arguments.py b/python/lsst/obs/base/cli/opt/arguments.py
@@ -19,8 +19,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from lsst.daf.butler.cli.utils import MWArgumentDecorator
-
-instrument_argument = MWArgumentDecorator(
-    "instrument", help="The name or fully-qualified class name of an instrument."
-)
+"""Shared arguments used by obs_base command-line tools."""
diff --git a/python/lsst/obs/base/cli/opt/options.py b/python/lsst/obs/base/cli/opt/options.py
@@ -21,10 +21,6 @@
 
 from lsst.daf.butler.cli.utils import MWOptionDecorator
 
-instrument_option = MWOptionDecorator(
-    "--instrument", help="The name or fully-qualified class name of an instrument."
-)
-
 failfast_option = MWOptionDecorator(
     "--fail-fast",
     help=(