Skip to content

Commit

Permalink
COMPUTE-2152 Remove dx upgrade (#1369)
Browse files Browse the repository at this point in the history
  • Loading branch information
kpjensen authored May 15, 2024
1 parent c274892 commit 27326f1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 110 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Categories for each release: Added, Changed, Deprecated, Removed, Fixed, Securit

## Unreleased

### Removed

* `dx upgrade` command. `python3 -m pip install -U dxpy` is the recommended installation method

## [376.0] - beta

* No significant changes
Expand Down
79 changes: 0 additions & 79 deletions build/upgrade.sh

This file was deleted.

31 changes: 0 additions & 31 deletions src/python/dxpy/scripts/dx.py
Original file line number Diff line number Diff line change
Expand Up @@ -4119,27 +4119,6 @@ def ssh(args, ssh_config_verified=False):
print(fill(tip.format(job_id=args.job_id)))
exit(exit_code)

def upgrade(args):
if len(args.args) == 0:
try:
greeting = dxpy.api.system_greet({'client': 'dxclient', 'version': 'v'+dxpy.TOOLKIT_VERSION}, auth=None)
if greeting['update']['available']:
recommended_version = greeting['update']['version']
else:
err_exit("Your SDK is up to date.", code=0)
except default_expected_exceptions as e:
print(e)
recommended_version = "current"
print("Upgrading to", recommended_version)
args.args = [recommended_version]

try:
cmd = os.path.join(os.environ['DNANEXUS_HOME'], 'build', 'upgrade.sh')
args.args.insert(0, cmd)
os.execv(cmd, args.args)
except:
err_exit()

def generate_batch_inputs(args):

# Internally restricted maximum batch size for a TSV
Expand Down Expand Up @@ -6346,16 +6325,6 @@ def __call__(self, parser, namespace, values, option_string=None):
# parser_api.completer = TODO
register_parser(parser_api)

#####################################
# upgrade
#####################################
parser_upgrade = subparsers.add_parser('upgrade', help='Upgrade dx-toolkit (the DNAnexus SDK and this program)',
description='Upgrades dx-toolkit (the DNAnexus SDK and this program) to the latest recommended version, or to a specified version and platform.',
prog='dx upgrade')
parser_upgrade.add_argument('args', nargs='*')
parser_upgrade.set_defaults(func=upgrade)
register_parser(parser_upgrade)

#####################################
# generate_batch_inputs
#####################################
Expand Down

0 comments on commit 27326f1

Please sign in to comment.