Skip to content

Commit

Permalink
Removed the --view option of shpc install
Browse files Browse the repository at this point in the history
  • Loading branch information
muffato committed Oct 10, 2022
1 parent 6e6ec0a commit df5589e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 17 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Expand Up @@ -109,13 +109,14 @@ jobs:
cat test_output
grep --quiet 'Python 3.9.5' test_output
rm test_output
shpc uninstall --force python:3.9.5-alpine
# Try creating views install
mkdir -p tmp-modules
shpc config set views_base:tmp-modules
shpc view create noodles
shpc install --view noodles python:3.9.5-alpine
shpc view install noodles python:3.9.5-alpine
shpc uninstall --force python:3.9.5-alpine
shpc view --force delete noodles
- name: Run python module tests (tcsh)
shell: tcsh -e {0}
Expand Down
6 changes: 0 additions & 6 deletions shpc/client/__init__.py
Expand Up @@ -101,12 +101,6 @@ def get_parser():
"install_recipe",
help="recipe to install\nshpc install python\nshpc install python:3.9.5-alpine",
)
install.add_argument(
"--view",
dest="view",
help="install module to a named view (must be installed to shpc first).",
default=None,
)
install.add_argument(
"--no-view",
dest="no_view",
Expand Down
9 changes: 1 addition & 8 deletions shpc/client/install.py
Expand Up @@ -3,7 +3,6 @@
__license__ = "MPL 2.0"

import shpc.utils
from shpc.logger import logger


def main(args, parser, extra, subparser):
Expand All @@ -25,11 +24,5 @@ def main(args, parser, extra, subparser):
# Update config settings on the fly
cli.settings.update_params(args.config_params)

# It doesn't make sense to define view and no view
if args.view and args.no_view:
logger.exit("Conflicting arguments --view and --no-view, choose one.")

# And do the install
cli.install(
args.install_recipe, view=args.view, disable_view=args.no_view, force=args.force
)
cli.install(args.install_recipe, disable_view=args.no_view, force=args.force)

0 comments on commit df5589e

Please sign in to comment.