Skip to content

Commit

Permalink
Merge pull request #264 from lsst/tickets/DM-35599
Browse files Browse the repository at this point in the history
DM-35599: Use a transfer option that does not include -t
  • Loading branch information
timj authored Sep 15, 2023
2 parents 67eca24 + 57d1873 commit 76ae3ab
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-toml
- repo: https://github.com/psf/black
rev: 23.7.0
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.9.1
hooks:
- id: black
# It is recommended to specify the latest version of Python
Expand All @@ -22,6 +22,6 @@ repos:
name: isort (python)
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.0.282
rev: v0.0.289
hooks:
- id: ruff
2 changes: 2 additions & 0 deletions doc/changes/DM-35599.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Removed shadowing of ``pipetask build -t`` by ``pipetask qgraph -t``.
``-t`` now means ``--task`` rather than ``--transfer``.
4 changes: 2 additions & 2 deletions python/lsst/ctrl/mpexec/cli/opt/optionGroups.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import click
import lsst.daf.butler.cli.opt as dafButlerOpts
import lsst.pipe.base.cli.opt as pipeBaseOpts
from lsst.daf.butler.cli.opt import transfer_option
from lsst.daf.butler.cli.opt import transfer_option_no_short
from lsst.daf.butler.cli.utils import OptionGroup, option_section, unwrap

from . import options as ctrlMpExecOpts
Expand Down Expand Up @@ -112,7 +112,7 @@ def __init__(self) -> None:
ctrlMpExecOpts.save_execution_butler_option(),
ctrlMpExecOpts.clobber_execution_butler_option(),
ctrlMpExecOpts.target_datastore_root_option(),
transfer_option(
transfer_option_no_short(
help=unwrap(
"""Data transfer mode for the execution butler datastore.
Defaults to "copy" if --target-datastore-root is provided.
Expand Down

0 comments on commit 76ae3ab

Please sign in to comment.